diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 0a1965782..61840af4c 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -154,17 +154,6 @@ module.exports = class KeyringController extends EventEmitter {
     .then(this.fullUpdate.bind(this))
   }
 
-  // ClearSeedWordCache
-  //
-  // returns Promise( @string currentSelectedAccount )
-  //
-  // Removes the current vault's seed words from the UI's state tree,
-  // ensuring they are only ever available in the background process.
-  clearSeedWordCache () {
-    this.configManager.setSeedWords(null)
-    return Promise.resolve(this.configManager.getSelectedAccount())
-  }
-
   // Set Locked
   // returns Promise( @object state )
   //
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 3e6ce0a2e..83dc2a9b9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -146,7 +146,14 @@ module.exports = class MetamaskController extends EventEmitter {
           promiseToCallback(this.keyringController.fullUpdate())(cb)
         })
       },
-      clearSeedWordCache: nodeify(keyringController.clearSeedWordCache).bind(keyringController),
+      // ClearSeedWordCache
+      //
+      // Removes the primary account's seed words from the UI's state tree,
+      // ensuring they are only ever available in the background process.
+      clearSeedWordCache: (cb) => {
+        this.configManager.setSeedWords(null)
+        cb(null, this.configManager.getSelectedAccount())
+      },
       setLocked: nodeify(keyringController.setLocked).bind(keyringController),
       submitPassword: (password, cb) => {
         this.migrateOldVaultIfAny(password)
@@ -321,9 +328,7 @@ module.exports = class MetamaskController extends EventEmitter {
   setupPublicConfig (outStream) {
     pipe(
       this.publicConfigStore,
-      outStream,
-      // cleanup on disconnect
-      () => this.publicConfigStore.unpipe(outStream)
+      outStream
     )
   }