diff --git a/res/app/components/stf/control/control-service.js b/res/app/components/stf/control/control-service.js
index 2f5f6736..d934f79b 100644
--- a/res/app/components/stf/control/control-service.js
+++ b/res/app/components/stf/control/control-service.js
@@ -46,7 +46,7 @@ module.exports = function ControlServiceFactory(
     function sendTwoWay(action, data) {
       var tx = TransactionService.create(target)
       socket.emit(action, channel, tx.channel, data)
-      return tx
+      return tx.promise
     }
 
     function touchSender(type) {
@@ -117,7 +117,7 @@ module.exports = function ControlServiceFactory(
       socket.emit('storage.upload', channel, tx.channel, {
         url: url
       })
-      return tx
+      return tx.promise
     }
 
     this.uploadFile = function(files) {
@@ -135,7 +135,7 @@ module.exports = function ControlServiceFactory(
           , file: files[0]
           })
         })
-      return tx
+      return tx.promise
     }
 
     this.install = function(options) {
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index 7be6d89e..661451ca 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -61,8 +61,7 @@ module.exports = function ($scope, gettext, $routeParams, $location, DeviceServi
       lastData: 'uploading'
     }
 
-    var upload = $scope.control.uploadFile($files)
-    return upload.promise
+    return $scope.control.uploadFile($files)
       .progressed(function (uploadResult) {
         $scope.$apply(function () {
           $scope.upload = uploadResult
@@ -79,8 +78,7 @@ module.exports = function ($scope, gettext, $routeParams, $location, DeviceServi
   }
 
   $scope.maybeInstallForced = function (options) {
-    var install = $scope.control.install(options)
-    return install.promise
+    return $scope.control.install(options)
       .progressed(function (installResult) {
         $scope.$apply(function () {
           installResult.manifest = options.manifest
diff --git a/res/app/control-panes/dashboard/shell/shell-controller.js b/res/app/control-panes/dashboard/shell/shell-controller.js
index fb8284fa..0bb3c6a0 100644
--- a/res/app/control-panes/dashboard/shell/shell-controller.js
+++ b/res/app/control-panes/dashboard/shell/shell-controller.js
@@ -11,10 +11,9 @@ module.exports = function ShellCtrl($scope, gettext) {
       return
     }
 
-    var cmd = $scope.control.shell(command)
     $scope.command = ''
 
-    return cmd.promise
+    return $scope.control.shell(command)
       .progressed(function(result) {
         $scope.result = result
         $scope.data = result.data.join('')
diff --git a/res/app/control-panes/dashboard/upload/activities/activities-controller.js b/res/app/control-panes/dashboard/upload/activities/activities-controller.js
index 11fd76dd..f2c4a362 100644
--- a/res/app/control-panes/dashboard/upload/activities/activities-controller.js
+++ b/res/app/control-panes/dashboard/upload/activities/activities-controller.js
@@ -86,9 +86,9 @@ module.exports = function ActivitiesCtrl($scope) {
         $scope.selectedPackageName + '/' + $scope.selectedActivityName
     }
 
-    var cmd = $scope.control.shell(command)
-    return cmd.promise.then(function (result) {
-      console.log(result)
-    })
+    return $scope.control.shell(command)
+      .then(function (result) {
+        console.log(result)
+      })
   }
 }
diff --git a/res/app/control-panes/dashboard/upload/upload-controller.js b/res/app/control-panes/dashboard/upload/upload-controller.js
index 19203afc..e0e87584 100644
--- a/res/app/control-panes/dashboard/upload/upload-controller.js
+++ b/res/app/control-panes/dashboard/upload/upload-controller.js
@@ -16,9 +16,8 @@ module.exports = function UploadCtrl($scope, SettingsService, gettext) {
       lastData: 'uploading'
     }
 
-    var upload = $scope.control.uploadUrl(url)
     $scope.installation = null
-    return upload.promise
+    return $scope.control.uploadUrl(url)
       .progressed(function (uploadResult) {
         $scope.$apply(function () {
           $scope.upload = uploadResult
@@ -40,9 +39,8 @@ module.exports = function UploadCtrl($scope, SettingsService, gettext) {
       lastData: 'uploading'
     }
 
-    var upload = $scope.control.uploadFile($files)
     $scope.installation = null
-    return upload.promise
+    return $scope.control.uploadFile($files)
       .progressed(function (uploadResult) {
         $scope.$apply(function () {
           $scope.upload = uploadResult
@@ -60,8 +58,7 @@ module.exports = function UploadCtrl($scope, SettingsService, gettext) {
 
   $scope.maybeInstall = function (options) {
     if ($scope.installEnabled) {
-      var install = $scope.control.install(options)
-      return install.promise
+      return $scope.control.install(options)
         .progressed(function (installResult) {
           $scope.$apply(function () {
             installResult.manifest = options.manifest
@@ -79,16 +76,16 @@ module.exports = function UploadCtrl($scope, SettingsService, gettext) {
   }
 
   $scope.uninstall = function (packageName) {
-    var tx = $scope.control.uninstall(packageName)
-    return tx.promise.then(function (result) {
-      if (result.success) {
-        $scope.$apply(function () {
-          $scope.clear()
-        })
-      } else {
-        console.error(result.error)
-      }
-    })
+    return $scope.control.uninstall(packageName)
+      .then(function (result) {
+        if (result.success) {
+          $scope.$apply(function () {
+            $scope.clear()
+          })
+        } else {
+          console.error(result.error)
+        }
+      })
   }
 
   $scope.taskFinished = function () {