diff --git a/lib/roles/device/plugins/account.js b/lib/roles/device/plugins/account.js
index 395e25f0..5a14bcc8 100644
--- a/lib/roles/device/plugins/account.js
+++ b/lib/roles/device/plugins/account.js
@@ -49,7 +49,7 @@ module.exports = syrup.serial()
           , reply.okay()
           ])
         })
-        .error(function(err) {
+        .catch(function(err) {
           log.error('Account removal failed', err.stack)
           push.send([
             channel
@@ -71,7 +71,7 @@ module.exports = syrup.serial()
           , reply.okay()
           ])
         })
-        .error(function(err) {
+        .catch(function(err) {
           log.error('Add account menu failed', err.stack)
           push.send([
             channel
diff --git a/lib/roles/device/plugins/sd.js b/lib/roles/device/plugins/sd.js
index 7dabeb13..61f670d5 100644
--- a/lib/roles/device/plugins/sd.js
+++ b/lib/roles/device/plugins/sd.js
@@ -22,7 +22,7 @@ module.exports = syrup.serial()
           , reply.okay(mounted ? 'sd_mounted' : 'sd_unmounted')
           ])
         })
-        .error(function(err) {
+        .catch(function(err) {
           log.error('Getting SD card Status', err.stack)
           push.send([
             channel
diff --git a/lib/roles/device/plugins/service.js b/lib/roles/device/plugins/service.js
index 9e8af4ad..0f26c48b 100644
--- a/lib/roles/device/plugins/service.js
+++ b/lib/roles/device/plugins/service.js
@@ -507,20 +507,20 @@ module.exports = syrup.serial()
 
     plugin.removeAccount = function(data) {
       return runServiceCommand(
-          apk.wire.MessageType.DO_REMOVE_ACCOUNT
-        , new apk.wire.DoRemoveAccountRequest({
-            type: data.type
-          , account: data.account
-          })
-        )
-        .timeout(15000)
-        .then(function(data) {
-          var response = apk.wire.DoRemoveAccountResponse.decode(data)
-          if (response.success) {
-            return true
-          }
-          throw new Error('Unable to remove account')
+        apk.wire.MessageType.DO_REMOVE_ACCOUNT
+      , new apk.wire.DoRemoveAccountRequest({
+          type: data.type
+        , account: data.account
         })
+      )
+      .timeout(15000)
+      .then(function(data) {
+        var response = apk.wire.DoRemoveAccountResponse.decode(data)
+        if (response.success) {
+          return true
+        }
+        throw new Error('Unable to remove account')
+      })
     }
 
     plugin.addAccountMenu = function() {
diff --git a/lib/roles/device/plugins/wifi.js b/lib/roles/device/plugins/wifi.js
index 2c758039..e26c0fc4 100644
--- a/lib/roles/device/plugins/wifi.js
+++ b/lib/roles/device/plugins/wifi.js
@@ -22,7 +22,7 @@ module.exports = syrup.serial()
           , reply.okay()
           ])
         })
-        .error(function(err) {
+        .catch(function(err) {
           log.error('Setting Wifi enabled failed', err.stack)
           push.send([
             channel
@@ -42,7 +42,7 @@ module.exports = syrup.serial()
           , reply.okay(enabled ? 'wifi_enabled' : 'wifi_disabled')
           ])
         })
-        .error(function(err) {
+        .catch(function(err) {
           log.error('Getting Wifi status failed', err.stack)
           push.send([
             channel
diff --git a/lib/wire/wire.proto b/lib/wire/wire.proto
index f6c08973..2c2e0a80 100644
--- a/lib/wire/wire.proto
+++ b/lib/wire/wire.proto
@@ -54,13 +54,13 @@ enum MessageType {
   RebootMessage              = 52;
   ConnectStartMessage        = 53;
   ConnectStopMessage         = 54;
-  AccountRemoveMessage       = 55;
   RingerSetMessage           = 56;
   WifiSetEnabledMessage      = 57;
   WifiGetStatusMessage       = 58;
   AccountAddMenuMessage      = 59;
   AccountAddMessage          = 60;
   AccountGetMessage          = 62;
+  AccountRemoveMessage       = 55;
   SdStatusMessage            = 61;
 }
 
@@ -391,11 +391,6 @@ message ConnectStartMessage {
 message ConnectStopMessage {
 }
 
-message AccountRemoveMessage {
-  required string type = 1;
-  optional string account = 2;
-}
-
 message AccountAddMenuMessage {
 }
 
@@ -408,6 +403,11 @@ message AccountGetMessage {
   required string type = 1;
 }
 
+message AccountRemoveMessage {
+  required string type = 1;
+  optional string account = 2;
+}
+
 message SdStatusMessage {
 }