diff --git a/public/app/features/dashboard/panel_model.ts b/public/app/features/dashboard/panel_model.ts
index a77828adbce..d89f810e95a 100644
--- a/public/app/features/dashboard/panel_model.ts
+++ b/public/app/features/dashboard/panel_model.ts
@@ -47,8 +47,8 @@ export class PanelModel {
   timeShift?: any;
   hideTimeOverride?: any;
 
-  maxDataPoints?: any;
-  interval?: any;
+  maxDataPoints?: number;
+  interval?: string;
 
   // non persisted
   fullscreen: boolean;
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index ee5c55816de..8ac3c36cf0f 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -148,19 +148,6 @@ class MetricsPanelCtrl extends PanelCtrl {
   }
 
   calculateInterval() {
-    // let intervalOverride = this.panel.interval;
-
-    // // if no panel interval check datasource
-    // if (intervalOverride) {
-    //   intervalOverride = this.templateSrv.replace(intervalOverride, this.panel.scopedVars);
-    // } else if (this.datasource && this.datasource.interval) {
-    //   intervalOverride = this.datasource.interval;
-    // }
-
-    // const res = kbn.calculateInterval(this.range, this.resolution, intervalOverride);
-    // this.interval = res.interval;
-    // this.intervalMs = res.intervalMs;
-
     const interval = calculateIntervalUtil(this.panel, this.datasource, this.range, this.resolution);
     this.interval = interval.interval;
     this.intervalMs = this.intervalMs;