diff --git a/src/components/App.js b/src/components/App.js
index 2bb955e..fbda4cd 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -24,7 +24,7 @@ export default class App extends React.Component {
     SupportStore.listen(this._onChange)
   }
 
-  componentDidUnmount() {
+  componentWillUnmount() {
     SupportStore.unlisten(this._onChange)
   }
 
diff --git a/src/components/ChromeNotice.js b/src/components/ChromeNotice.js
index cc5fd66..4bd03ab 100644
--- a/src/components/ChromeNotice.js
+++ b/src/components/ChromeNotice.js
@@ -4,7 +4,7 @@ import SupportStore from '../stores/SupportStore'
 
 function getState() {
   return {
-    active: SupportStore.getState().isChrome && DownloadStore.getState().fileSize >= 500000000 
+    active: SupportStore.getState().isChrome && DownloadStore.getState().fileSize >= 500000000
   }
 }
 
@@ -24,7 +24,7 @@ export default class ChromeNotice extends React.Component {
     SupportStore.listen(this._onChange)
   }
 
-  componentDidUnmount() {
+  componentWillUnmount() {
     DownloadStore.unlisten(this._onChange)
     SupportStore.unlisten(this._onChange)
   }
diff --git a/src/components/DownloadButton.js b/src/components/DownloadButton.js
index 2a3e16c..20a6494 100644
--- a/src/components/DownloadButton.js
+++ b/src/components/DownloadButton.js
@@ -1,6 +1,10 @@
 import React from 'react'
 
 export default class DownloadButton extends React.Component {
+  constructor() {
+    super()
+    this.onClick = this.onClick.bind(this)
+  }
 
   onClick(e) {
     this.props.onClick(e)
@@ -9,7 +13,7 @@ export default class DownloadButton extends React.Component {
   render() {
     return <button
       className="download-button"
-      onClick={this.onClick.bind(this)}>
+      onClick={this.onClick}>
       Download
     </button>
   }
diff --git a/src/components/DownloadPage.js b/src/components/DownloadPage.js
index 5b02e12..8279246 100644
--- a/src/components/DownloadPage.js
+++ b/src/components/DownloadPage.js
@@ -17,13 +17,15 @@ export default class DownloadPage extends React.Component {
     this._onChange = () => {
       this.setState(DownloadStore.getState())
     }
+
+    this.downloadFile = this.downloadFile.bind(this)
   }
 
   componentDidMount() {
     DownloadStore.listen(this._onChange)
   }
 
-  componentDidUnmount() {
+  componentWillUnmount() {
     DownloadStore.unlisten(this._onChange)
   }
 
@@ -43,7 +45,7 @@ export default class DownloadPage extends React.Component {
 
           <ChromeNotice />
           <p className="notice">Peers: {this.state.peers} &middot; Up: {formatSize(this.state.speedUp)} &middot; Down: {formatSize(this.state.speedDown)}</p>
-          <DownloadButton onClick={this.downloadFile.bind(this)} />
+          <DownloadButton onClick={this.downloadFile} />
 
         </div>
 
diff --git a/src/components/DropZone.js b/src/components/DropZone.js
index 33e3f99..538b447 100644
--- a/src/components/DropZone.js
+++ b/src/components/DropZone.js
@@ -5,6 +5,11 @@ export default class DropZone extends React.Component {
   constructor() {
     super()
     this.state = { focus: false }
+
+    this.onDragEnter = this.onDragEnter.bind(this)
+    this.onDragLeave = this.onDragLeave.bind(this)
+    this.onDragOver = this.onDragOver.bind(this)
+    this.onDrop = this.onDrop.bind(this)
   }
 
   onDragEnter() {
@@ -31,10 +36,10 @@ export default class DropZone extends React.Component {
 
   render() {
     return <div className="drop-zone" ref="root"
-      onDragEnter={this.onDragEnter.bind(this)}
-      onDragLeave={this.onDragLeave.bind(this)}
-      onDragOver={this.onDragOver.bind(this)}
-      onDrop={this.onDrop.bind(this)}>
+      onDragEnter={this.onDragEnter}
+      onDragLeave={this.onDragLeave}
+      onDragOver={this.onDragOver}
+      onDrop={this.onDrop}>
 
       <div className="drop-zone-overlay"
         hidden={!this.state.focus}
diff --git a/src/components/ErrorPage.js b/src/components/ErrorPage.js
index 3ec3abc..9e54c18 100644
--- a/src/components/ErrorPage.js
+++ b/src/components/ErrorPage.js
@@ -17,7 +17,7 @@ export default class ErrorPage extends React.Component {
     ErrorStore.listen(this._onChange)
   }
 
-  componentDidUnmount() {
+  componentWillUnmount() {
     ErrorStore.unlisten(this._onChange)
   }
 
diff --git a/src/components/Tempalink.js b/src/components/Tempalink.js
index 8cebd4c..8ae9ef7 100644
--- a/src/components/Tempalink.js
+++ b/src/components/Tempalink.js
@@ -1,6 +1,10 @@
 import React from 'react'
 
 export default class Tempalink extends React.Component {
+  constructor() {
+    super()
+    this.onClick = this.onClick.bind(this)
+  }
 
   onClick() {
     this.refs.input.getDOMNode().setSelectionRange(0, 9999)
@@ -10,7 +14,7 @@ export default class Tempalink extends React.Component {
     var url = window.location.origin + '/' + this.props.token
     return <input
       className="tempalink"
-      onClick={this.onClick.bind(this)}
+      onClick={this.onClick}
       readOnly
       ref="input"
       type="text"
diff --git a/src/components/UploadPage.js b/src/components/UploadPage.js
index e7cf192..7d47709 100644
--- a/src/components/UploadPage.js
+++ b/src/components/UploadPage.js
@@ -12,40 +12,42 @@ export default class UploadPage extends React.Component {
   constructor() {
     super()
     this.state = UploadStore.getState()
-  
+
     this._onChange = () => {
       this.setState(UploadStore.getState())
     }
+
+    this.uploadFile = this.uploadFile.bind(this)
   }
-  
+
   componentDidMount() {
     UploadStore.listen(this._onChange)
   }
-  
-  componentDidUnmount() {
+
+  componentWillUnmount() {
     UploadStore.unlisten(this._onChange)
   }
-  
+
   uploadFile(file) {
     UploadActions.uploadFile(file)
   }
-  
+
   handleSelectedFile(event) {
     let files = event.target.files
     if (files.length > 0) {
       UploadActions.uploadFile(files[0])
     }
   }
-  
+
   render() {
     switch (this.state.status) {
       case 'ready':
-  
-        return <DropZone onDrop={this.uploadFile.bind(this)}>
+
+        return <DropZone onDrop={this.uploadFile}>
           <div className="page">
-  
+
             <Spinner dir="up" />
-  
+
             <h1>FilePizza</h1>
             <p>Free peer-to-peer file transfers in your browser.</p>
             <p>We never store anything. Files only served fresh.</p>
@@ -57,30 +59,30 @@ export default class UploadPage extends React.Component {
             </p>
           </div>
         </DropZone>
-  
+
       case 'processing':
         return <div className="page">
-  
+
           <Spinner dir="up" animated />
-  
+
           <h1>FilePizza</h1>
           <p>Processing...</p>
-  
+
         </div>
-  
+
       case 'uploading':
         return <div className="page">
-  
+
           <h1>FilePizza</h1>
           <Spinner dir="up" animated
             name={this.state.fileName}
             size={this.state.fileSize} />
-  
+
           <p>Send someone this link to download.</p>
           <p>This link will work as long as this page is open.</p>
           <p>Peers: {this.state.peers} &middot; Up: {formatSize(this.state.speedUp)}</p>
           <Tempalink token={this.state.token} />
-  
+
         </div>
     }
   }
diff --git a/src/components/Uploader.js b/src/components/Uploader.js
index 449ec25..7e1af06 100644
--- a/src/components/Uploader.js
+++ b/src/components/Uploader.js
@@ -3,6 +3,10 @@ import React from 'react';
 import UploadActions from '@app/actions/UploadActions';
 
 export default class UploadPage extends React.Component {
+  constructor() {
+    super()
+    this.uploadFile = this.uploadFile.bind(this)
+  }
 
   uploadFile(file) {
     UploadActions.uploadFile(file);
@@ -12,7 +16,7 @@ export default class UploadPage extends React.Component {
     switch (this.props.status) {
       case 'ready':
         return <div>
-          <DropZone onDrop={this.uploadFile.bind(this)} />
+          <DropZone onDrop={this.uploadFile} />
           <Arrow dir="up" />
         </div>;
         break;