diff --git a/public/app/core/components/info_popover.ts b/public/app/core/components/info_popover.ts
index 9b5b2877d54..98bbde1e683 100644
--- a/public/app/core/components/info_popover.ts
+++ b/public/app/core/components/info_popover.ts
@@ -40,14 +40,6 @@ export function infoPopover() {
           }
         });
 
-      // inputElem.on('focus.popover', function() {
-      //   drop.open();
-      // });
-      //
-      // inputElem.on('blur.popover', function() {
-      //   close();
-      // });
-
         scope.$on('$destroy', function() {
           drop.destroy();
         });
diff --git a/public/app/core/components/switch.ts b/public/app/core/components/switch.ts
index 718837c7600..c2ac6ca1497 100644
--- a/public/app/core/components/switch.ts
+++ b/public/app/core/components/switch.ts
@@ -18,9 +18,8 @@ export class SwitchCtrl {
   checked: any;
   show: any;
 
-  constructor($element) {
-    // hack to workaround animation
-    // happening on first show
+  /** @ngInject */
+  constructor() {
     this.show = true;
   }