diff --git a/src/Avatar.js b/src/Avatar.js
index 9889b480..74b279c6 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -37,13 +37,10 @@ module.exports = {
         switch (total % 3) {
             case 0:
                 return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9QjNbxSKP4eagAFnTseHFErFYLBaLxWKxWCwWi8Vi8cX4CzAABSwCRWJw31gAAAAASUVORK5CYII=";
-                break;
             case 1:
                 return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9chOaxgCP4eagAFk9seHFErFYLBaLxWKxWCwWi8Vi8cX4CzAAtKMCks/JG8MAAAAASUVORK5CYII=";
-                break;
             case 2:
                 return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9YzNayQCP4eagADldseHFErFYLBaLxWKxWCwWi8Vi8cX4CzAAyiACeHwPiu4AAAAASUVORK5CYII=";
-                break;
         }
     }
 }
diff --git a/src/ContextualMenu.js b/src/ContextualMenu.js
index cabab0c3..cdfff952 100644
--- a/src/ContextualMenu.js
+++ b/src/ContextualMenu.js
@@ -18,7 +18,6 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var q = require('q');
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
diff --git a/src/skins/vector/views/molecules/BottomLeftMenu.js b/src/skins/vector/views/molecules/BottomLeftMenu.js
index d7a25221..809da0ee 100644
--- a/src/skins/vector/views/molecules/BottomLeftMenu.js
+++ b/src/skins/vector/views/molecules/BottomLeftMenu.js
@@ -17,12 +17,9 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require('classnames');
 
 var dis = require('matrix-react-sdk/lib/dispatcher');
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-
 module.exports = React.createClass({
     displayName: 'BottomLeftMenu',
 
diff --git a/src/skins/vector/views/molecules/ContextualMenu.js b/src/skins/vector/views/molecules/ContextualMenu.js
index 1f0069de..e2d75da7 100644
--- a/src/skins/vector/views/molecules/ContextualMenu.js
+++ b/src/skins/vector/views/molecules/ContextualMenu.js
@@ -17,11 +17,6 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require('classnames');
-
-var dis = require('matrix-react-sdk/lib/dispatcher');
-
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 
 module.exports = React.createClass({
     displayName: 'ContextualMenu',
diff --git a/src/skins/vector/views/molecules/EventAsTextTile.js b/src/skins/vector/views/molecules/EventAsTextTile.js
index b9d729eb..698d2c15 100644
--- a/src/skins/vector/views/molecules/EventAsTextTile.js
+++ b/src/skins/vector/views/molecules/EventAsTextTile.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 var React = require('react');
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile')
 var sdk = require('matrix-react-sdk')
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
diff --git a/src/skins/vector/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js
index 63825359..34c2c576 100644
--- a/src/skins/vector/views/molecules/MImageTile.js
+++ b/src/skins/vector/views/molecules/MImageTile.js
@@ -52,7 +52,6 @@ module.exports = React.createClass({
     },
 
     onClick: function(ev) {
-        var ms = ev.getModifierState();
         if (ev.button == 0 && !ev.metaKey) {
             ev.preventDefault();
             var content = this.props.mxEvent.getContent();
diff --git a/src/skins/vector/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js
index d20b248e..4e163e1d 100644
--- a/src/skins/vector/views/molecules/MRoomMemberTile.js
+++ b/src/skins/vector/views/molecules/MRoomMemberTile.js
@@ -20,7 +20,6 @@ var React = require('react');
 
 var MRoomMemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MRoomMemberTile')
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk')
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
 
diff --git a/src/skins/vector/views/molecules/MemberTile.js b/src/skins/vector/views/molecules/MemberTile.js
index 30ac6880..e8b9eeac 100644
--- a/src/skins/vector/views/molecules/MemberTile.js
+++ b/src/skins/vector/views/molecules/MemberTile.js
@@ -20,7 +20,6 @@ var React = require('react');
 
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk')
-var Modal = require('matrix-react-sdk/lib/Modal');
 var ContextualMenu = require('../../../../ContextualMenu');
 var MemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MemberTile')
 
diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js
index 8b6ff6af..c94cade5 100644
--- a/src/skins/vector/views/molecules/MessageComposer.js
+++ b/src/skins/vector/views/molecules/MessageComposer.js
@@ -20,7 +20,6 @@ var React = require('react');
 
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer')
-var ContentMessages = require('matrix-react-sdk/lib/ContentMessages');
 
 var sdk = require('matrix-react-sdk')
 
diff --git a/src/skins/vector/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js
index 357d4bf9..386b19d3 100644
--- a/src/skins/vector/views/molecules/MessageTile.js
+++ b/src/skins/vector/views/molecules/MessageTile.js
@@ -20,7 +20,6 @@ var React = require('react');
 
 var classNames = require("classnames");
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk')
 
 var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile')
diff --git a/src/skins/vector/views/molecules/RoomCreate.js b/src/skins/vector/views/molecules/RoomCreate.js
index d4541f42..cadc0fc0 100644
--- a/src/skins/vector/views/molecules/RoomCreate.js
+++ b/src/skins/vector/views/molecules/RoomCreate.js
@@ -17,12 +17,9 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require('classnames');
 
 //var RoomCreateController = require('matrix-react-sdk/lib/controllers/molecules/RoomCreateController')
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-
 module.exports = React.createClass({
     displayName: 'RoomCreate',
     // mixins: [RoomCreateController],
diff --git a/src/skins/vector/views/molecules/RoomDropTarget.js b/src/skins/vector/views/molecules/RoomDropTarget.js
index c3e8aa1f..b1e15077 100644
--- a/src/skins/vector/views/molecules/RoomDropTarget.js
+++ b/src/skins/vector/views/molecules/RoomDropTarget.js
@@ -17,12 +17,9 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require('classnames');
 
 //var RoomDropTargetController = require('matrix-react-sdk/lib/controllers/molecules/RoomDropTargetController')
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-
 module.exports = React.createClass({
     displayName: 'RoomDropTarget',
     // mixins: [RoomDropTargetController],
diff --git a/src/skins/vector/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js
index b674fe2c..8cccc3c3 100644
--- a/src/skins/vector/views/molecules/voip/CallView.js
+++ b/src/skins/vector/views/molecules/voip/CallView.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 var React = require('react');
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk')
 var CallViewController = require(
     "matrix-react-sdk/lib/controllers/molecules/voip/CallView"
diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
index d3b8636e..80160b78 100644
--- a/src/skins/vector/views/molecules/voip/VideoView.js
+++ b/src/skins/vector/views/molecules/voip/VideoView.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 var React = require('react');
 
-var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
 var sdk = require('matrix-react-sdk')
 var VideoViewController = require('matrix-react-sdk/lib/controllers/molecules/voip/VideoView')
 
diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/skins/vector/views/organisms/LeftPanel.js
index 9941cfa2..15612704 100644
--- a/src/skins/vector/views/organisms/LeftPanel.js
+++ b/src/skins/vector/views/organisms/LeftPanel.js
@@ -26,7 +26,6 @@ module.exports = React.createClass({
         var RoomList = sdk.getComponent('organisms.RoomList');
         var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu');
         var IncomingCallBox = sdk.getComponent('molecules.voip.IncomingCallBox');
-        var RoomCreate = sdk.getComponent('molecules.RoomCreate');
 
         return (
             <aside className="mx_LeftPanel">
diff --git a/src/skins/vector/views/organisms/Notifier.js b/src/skins/vector/views/organisms/Notifier.js
index dad456cd..bbd2563d 100644
--- a/src/skins/vector/views/organisms/Notifier.js
+++ b/src/skins/vector/views/organisms/Notifier.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 var NotifierController = require('matrix-react-sdk/lib/controllers/organisms/Notifier')
 
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
 var extend = require('matrix-react-sdk/lib/extend');
 var dis = require('matrix-react-sdk/lib/dispatcher');
diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
index 81f95fd4..17b6aac3 100644
--- a/src/skins/vector/views/organisms/RoomView.js
+++ b/src/skins/vector/views/organisms/RoomView.js
@@ -23,7 +23,6 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk')
 var classNames = require("classnames");
 var filesize = require('filesize');
-var q = require('q');
 
 var RoomViewController = require('matrix-react-sdk/lib/controllers/organisms/RoomView')
 
diff --git a/src/skins/vector/views/organisms/UserSettings.js b/src/skins/vector/views/organisms/UserSettings.js
index 515a71aa..75951651 100644
--- a/src/skins/vector/views/organisms/UserSettings.js
+++ b/src/skins/vector/views/organisms/UserSettings.js
@@ -42,6 +42,7 @@ module.exports = React.createClass({
     },
 
     changePassword: function() {
+        var ChangePassword = sdk.getComponent('molecules/ChangePassword');
         Modal.createDialog(ChangePassword);
     },
 
@@ -61,7 +62,6 @@ module.exports = React.createClass({
             case this.Phases.Display:
                 var EditableText = sdk.getComponent('atoms/EditableText');
                 var EnableNotificationsButton = sdk.getComponent('atoms/EnableNotificationsButton');
-                var ChangePassword = sdk.getComponent('molecules/ChangePassword');
                 return (
                     <div className="mx_UserSettings">
                         <div className="mx_UserSettings_User">
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
index 2b912df4..5c72ff70 100644
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ b/src/skins/vector/views/pages/MatrixChat.js
@@ -23,7 +23,6 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
 
 // should be atomised
 var Loader = require("react-loader");
-var classNames = require("classnames");
 
 var dis = require('matrix-react-sdk/lib/dispatcher');
 
diff --git a/src/skins/vector/views/templates/Register.js b/src/skins/vector/views/templates/Register.js
index d0c3b146..fa4a3e18 100644
--- a/src/skins/vector/views/templates/Register.js
+++ b/src/skins/vector/views/templates/Register.js
@@ -73,18 +73,6 @@ module.exports = React.createClass({
         });
     },
 
-    getUserIdSuffix: function() {
-        return '';
-        var actualHsUrl = document.createElement('a');
-        actualHsUrl.href = this.getHsUrl();
-        var defaultHsUrl = document.createElement('a');
-        defaultHsUrl.href = this.DEFAULT_HS_URL;
-        if (actualHsUrl.host == defaultHsUrl.host) {
-            return ':matrix.org';
-        }
-        return '';
-    },
-
     onServerUrlChanged: function(newUrl) {
         this.customHsUrl = this.refs.serverConfig.getHsUrl();
         this.customIsUrl = this.refs.serverConfig.getIsUrl();
@@ -101,7 +89,7 @@ module.exports = React.createClass({
                     <div>
                         <form onSubmit={this.onInitialStageSubmit}>
                         <input className="mx_Login_field" type="text" ref="email" placeholder="Email address" defaultValue={this.savedParams.email} /><br />
-                        <input className="mx_Login_field" type="text" ref="username" placeholder="User name" defaultValue={this.savedParams.username} />{this.getUserIdSuffix()}<br />
+                        <input className="mx_Login_field" type="text" ref="username" placeholder="User name" defaultValue={this.savedParams.username} /><br />
                         <input className="mx_Login_field" type="password" ref="password" placeholder="Password" defaultValue={this.savedParams.password} /><br />
                         <input className="mx_Login_field" type="password" ref="confirmPassword" placeholder="Confirm password" defaultValue={this.savedParams.confirmPassword} /><br />