diff --git a/res/app/components/stf/standalone/standalone-directive.js b/res/app/components/stf/standalone/standalone-directive.js
index 996ccfd5..61857195 100644
--- a/res/app/components/stf/standalone/standalone-directive.js
+++ b/res/app/components/stf/standalone/standalone-directive.js
@@ -1,9 +1,10 @@
-module.exports = function standaloneDirective($rootScope, $window) {
+module.exports = function standaloneDirective($rootScope) {
   return {
     restrict: 'AE',
     link: function () {
-      $rootScope.standalone = $window.history.length < 2
-      //$rootScope.standalone = true
+      //$rootScope.standalone = $window.history.length < 2
+      // Disable standalone for now
+      $rootScope.standalone = false
     }
   }
 }
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index bb9b9d36..1db5f1d5 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -28,12 +28,12 @@ module.exports =
         templateUrl: 'control-panes/automation/automation.jade',
         filters: ['native', 'web']
       },
-      {
-        title: gettext('Performance'),
-        icon: 'fa-bar-chart',
-        templateUrl: 'control-panes/performance/performance.jade',
-        filters: ['native', 'web']
-      },
+      //{
+      //  title: gettext('Performance'),
+      //  icon: 'fa-bar-chart',
+      //  templateUrl: 'control-panes/performance/performance.jade',
+      //  filters: ['native', 'web']
+      //},
       {
         title: gettext('Advanced'),
         icon: 'fa-bolt',
diff --git a/res/app/control-panes/performance/cpu/cpu-controller.js b/res/app/control-panes/performance/cpu/cpu-controller.js
index 103ccf3a..48db4162 100644
--- a/res/app/control-panes/performance/cpu/cpu-controller.js
+++ b/res/app/control-panes/performance/cpu/cpu-controller.js
@@ -1,4 +1,4 @@
-module.exports = function CpuCtrl($scope, $timeout) {
+module.exports = function CpuCtrl() {
 
 
   //var RealTimeData = function (layers) {
diff --git a/res/app/control-panes/performance/performance-controller.js b/res/app/control-panes/performance/performance-controller.js
index 5361252b..d3d6d18b 100644
--- a/res/app/control-panes/performance/performance-controller.js
+++ b/res/app/control-panes/performance/performance-controller.js
@@ -1,3 +1,3 @@
-module.exports = function PerformanceCtrl($scope) {
-    
+module.exports = function PerformanceCtrl() {
+
 }
diff --git a/res/app/settings/keys/adb-keys/adb-keys-controller.js b/res/app/settings/keys/adb-keys/adb-keys-controller.js
index 8f07e197..19b69b2a 100644
--- a/res/app/settings/keys/adb-keys/adb-keys-controller.js
+++ b/res/app/settings/keys/adb-keys/adb-keys-controller.js
@@ -1,6 +1,5 @@
 module.exports =
-  function AdbKeysCtrl($scope, $http, UserService, AddAdbKeyModalService,
-    FatalMessageService) {
+  function AdbKeysCtrl($scope, $http, UserService) {
     $scope.adbKeys = []
 
     function updateKeys() {
diff --git a/res/app/settings/keys/keys.jade b/res/app/settings/keys/keys.jade
index a5e4ac85..85022616 100644
--- a/res/app/settings/keys/keys.jade
+++ b/res/app/settings/keys/keys.jade
@@ -1,5 +1,5 @@
 .row
-  .col-md-6
+  //.col-md-6
     div(ng-include='"settings/keys/access-tokens/access-tokens.jade"')
   .col-md-6
     div(ng-include='"settings/keys/adb-keys/adb-keys.jade"')