diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index bac85ab325..f2ada35b24 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -19,6 +19,10 @@ limitations under the License.
 var MatrixClientPeg = require("./MatrixClientPeg");
 var Notifier = require("./Notifier");
 
+/*
+ * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
+ */
+
 module.exports = {
 
     loadProfileInfo: function() {
@@ -35,7 +39,7 @@ module.exports = {
     },
 
     saveThreePids: function(threePids) {
-
+        // TODO
     },
 
     getEnableNotifications: function() {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index a77b20d3d8..219ad10714 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -58,8 +58,7 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return {
-            phase: this.Phases.Edit,
-            errorString: ''
+            phase: this.Phases.Edit
         }
     },
 
@@ -73,8 +72,7 @@ module.exports = React.createClass({
         };
 
         this.setState({
-            phase: this.Phases.Uploading,
-            errorString: '',
+            phase: this.Phases.Uploading
         });
 
         var self = this;
@@ -84,8 +82,7 @@ module.exports = React.createClass({
             self.props.onError(err);
         }).finally(function() {
             self.setState({
-                phase: self.Phases.Edit,
-                errorString: ""
+                phase: self.Phases.Edit
             });
         }).done();
     },