diff --git a/public/app/features/panel/panel.ts b/public/app/features/panel/panel.ts
index 94aeb3878aa..c2415aaa1da 100644
--- a/public/app/features/panel/panel.ts
+++ b/public/app/features/panel/panel.ts
@@ -6,16 +6,8 @@ import {PanelCtrl} from './panel_ctrl';
 import {MetricsPanelCtrl} from './metrics_panel_ctrl';
 import {QueryCtrl} from './query_ctrl';
 
-class DefaultPanelCtrl extends PanelCtrl {
-  /** @ngInject */
-  constructor($scope, $injector) {
-    super($scope, $injector);
-  }
-}
-
 export {
   PanelCtrl,
-  DefaultPanelCtrl,
   MetricsPanelCtrl,
   QueryCtrl,
 }
diff --git a/public/app/features/panel/partials/query_editor_row.html b/public/app/features/panel/partials/query_editor_row.html
index 4cf21b32e17..81f7e4f6c98 100644
--- a/public/app/features/panel/partials/query_editor_row.html
+++ b/public/app/features/panel/partials/query_editor_row.html
@@ -33,7 +33,7 @@
 		</li>
 		<li class="tight-form-item last">
 			<a class="pointer" tabindex="1" ng-click="ctrl.removeQuery(target)">
-				<i class="fa fa-remove"></i>
+				<i class="fa fa-trash"></i>
 			</a>
 		</li>
 	</ul>
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts
index 4cb35b71a4b..5e781571eff 100644
--- a/public/app/plugins/panel/text/module.ts
+++ b/public/app/plugins/panel/text/module.ts
@@ -1,7 +1,7 @@
 ///<reference path="../../../headers/common.d.ts" />
 
 import _ from 'lodash';
-import {PanelCtrl} from '../../../features/panel/panel';
+import {PanelCtrl} from 'app/features/panel/panel';
 
  // Set and populate defaults
 var panelDefaults = {