diff --git a/src/components/ContainerListItem.react.js b/src/components/ContainerListItem.react.js
index 2791ca9d22..1e6af7a9a7 100644
--- a/src/components/ContainerListItem.react.js
+++ b/src/components/ContainerListItem.react.js
@@ -97,7 +97,7 @@ var ContainerListItem = React.createClass({
 
     return (
       <Router.Link to="container" params={{name: container.Name}}>
-        <li onMouseEnter={self.handleItemMouseEnter} onMouseLeave={self.handleItemMouseLeave} onClick={self.handleClick}>
+        <li onMouseEnter={self.handleItemMouseEnter} onMouseLeave={self.handleItemMouseLeave} onClick={self.handleClick} id={this.props.key}>
           {state}
           <div className="info">
             <div className="name">
diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js
index 655a7930b3..130557f15f 100644
--- a/src/components/Containers.react.js
+++ b/src/components/Containers.react.js
@@ -26,7 +26,7 @@ var Containers = React.createClass({
     containerStore.listen(this.update);
   },
 
-  componentDidUnmount: function () {
+  componentWillUnmount: function () {
     containerStore.unlisten(this.update);
   },
 
@@ -109,42 +109,6 @@ var Containers = React.createClass({
     shell.openExternal('https://github.com/docker/kitematic/issues/new');
   },
 
-  // handleMouseEnterDockerTerminal: function () {
-  //   this.setState({
-  //     currentButtonLabel: 'Open terminal to use Docker command line.'
-  //   });
-  // },
-  //
-  // handleMouseLeaveDockerTerminal: function () {
-  //   this.setState({
-  //     currentButtonLabel: ''
-  //   });
-  // },
-  //
-  // handleMouseEnterReportIssue: function () {
-  //   this.setState({
-  //     currentButtonLabel: 'Report an issue or suggest feedback.'
-  //   });
-  // },
-  //
-  // handleMouseLeaveReportIssue: function () {
-  //   this.setState({
-  //     currentButtonLabel: ''
-  //   });
-  // },
-  //
-  // handleMouseEnterPreferences: function () {
-  //   this.setState({
-  //     currentButtonLabel: 'Change app preferences.'
-  //   });
-  // },
-  //
-  // handleMouseLeavePreferences: function () {
-  //   this.setState({
-  //     currentButtonLabel: ''
-  //   });
-  // },
-
   render: function () {
     var sidebarHeaderClass = 'sidebar-header';
     if (this.state.sidebarOffset) {
diff --git a/src/components/NewContainerSearch.react.js b/src/components/NewContainerSearch.react.js
index 06b72dc946..410b4e43ff 100644
--- a/src/components/NewContainerSearch.react.js
+++ b/src/components/NewContainerSearch.react.js
@@ -73,7 +73,6 @@ module.exports = React.createClass({
       nextPage = (page + 1 > this.state.totalPage) ? this.state.totalPage : page + 1;
       totalPage = this.state.totalPage;
     }
-
     this.setState({
       query: query,
       loading: true,
diff --git a/src/components/Setup.react.js b/src/components/Setup.react.js
index 80827ef3da..d72a291076 100644
--- a/src/components/Setup.react.js
+++ b/src/components/Setup.react.js
@@ -21,7 +21,7 @@ var Setup = React.createClass({
     setupStore.listen(this.update);
   },
 
-  componentDidUnmount: function () {
+  componentWillUnmount: function () {
     setupStore.unlisten(this.update);
   },
 
diff --git a/src/utils/SetupUtil.js b/src/utils/SetupUtil.js
index 7b50ec6e6a..2e55a8eab1 100644
--- a/src/utils/SetupUtil.js
+++ b/src/utils/SetupUtil.js
@@ -109,7 +109,6 @@ export default {
   },
 
   async nonNativeSetup () {
-    console.log('Non-native setup');
     let virtualBoxVersion = null;
     let machineVersion = null;
     while (true) {