diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js
index 8ccbb170d8a..b9893b2dcda 100644
--- a/src/app/controllers/dashboardCtrl.js
+++ b/src/app/controllers/dashboardCtrl.js
@@ -44,7 +44,7 @@ function (angular, $, config, _) {
     $scope.setupDashboard = function(event, dashboardData) {
       $rootScope.performance.dashboardLoadStart = new Date().getTime();
       $rootScope.performance.panelsInitialized = 0;
-      $rootScope.performance.panelsRendered= 0;
+      $rootScope.performance.panelsRendered = 0;
 
       $scope.dashboard = dashboardSrv.create(dashboardData);
       $scope.dashboardViewState = dashboardViewStateSrv.create($scope);
@@ -93,14 +93,6 @@ function (angular, $, config, _) {
       };
     };
 
-    $scope.panel_path =function(type) {
-      if(type) {
-        return 'app/panels/'+type.replace(".","/");
-      } else {
-        return false;
-      }
-    };
-
     $scope.edit_path = function(type) {
       var p = $scope.panel_path(type);
       if(p) {
diff --git a/src/app/partials/paneladd.html b/src/app/partials/paneladd.html
deleted file mode 100644
index f902bbce561..00000000000
--- a/src/app/partials/paneladd.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ng-include="'app/partials/panelgeneral.html'"></div>
-<div ng-if="!panelMeta.fullEditorTabs" ng-include="edit_path(panel.type)"></div>
-<div ng-repeat="tab in panelMeta.editorTabs">
-  <h5>{{tab.title}}</h5>
-  <div ng-include="tab.src"></div>
-</div>
\ No newline at end of file
diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js
index 27bbe8ee027..ba8dcaf0f23 100644
--- a/src/app/services/dashboard/dashboardKeyBindings.js
+++ b/src/app/services/dashboard/dashboardKeyBindings.js
@@ -18,8 +18,8 @@ function(angular, $) {
         keyboardManager.unbind('ctrl+s');
         keyboardManager.unbind('ctrl+r');
         keyboardManager.unbind('ctrl+z');
+        keyboardManager.unbind('esc');
       });
-      keyboardManager.unbind('esc');
 
       keyboardManager.bind('ctrl+f', function() {
         scope.emitAppEvent('show-dash-editor', { src: 'app/partials/search.html' });