diff --git a/pkg/tsdb/models.go b/pkg/tsdb/models.go
index b8c55f1e60d..0060f459d7b 100644
--- a/pkg/tsdb/models.go
+++ b/pkg/tsdb/models.go
@@ -56,8 +56,8 @@ type QueryResult struct {
 }
 
 type TimeSeries struct {
-	Name   string        `json:"name"`
-	Points [][2]*float64 `json:"points"`
+	Name   string        `json:"target"`
+	Points [][2]*float64 `json:"datapoints"`
 }
 
 type TimeSeriesSlice []*TimeSeries
diff --git a/public/app/plugins/app/testdata/datasource/datasource.ts b/public/app/plugins/app/testdata/datasource/datasource.ts
index 75b43bd34c9..32edfb59755 100644
--- a/public/app/plugins/app/testdata/datasource/datasource.ts
+++ b/public/app/plugins/app/testdata/datasource/datasource.ts
@@ -22,12 +22,6 @@ class TestDataDatasource {
       scenario: options.targets[0].scenario,
       interval: options.intervalMs,
       maxDataPoints: options.maxDataPoints,
-    }).then(res => {
-      res.data = res.data.map(item => {
-        return {target: item.name, datapoints: item.points};
-      });
-
-      return res;
     });
   }
 
diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 58799778acd..3ae030e4423 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -9,6 +9,8 @@ class GrafanaDatasource {
     return this.backendSrv.get('/api/metrics/test', {
       from: options.range.from.valueOf(),
       to: options.range.to.valueOf(),
+      scenario: 'random_walk',
+      interval: options.intervalMs,
       maxDataPoints: options.maxDataPoints
     });
   }
diff --git a/public/app/plugins/panel/graph/data_processor.ts b/public/app/plugins/panel/graph/data_processor.ts
index 404b5a90aee..bb8af84cf00 100644
--- a/public/app/plugins/panel/graph/data_processor.ts
+++ b/public/app/plugins/panel/graph/data_processor.ts
@@ -98,65 +98,13 @@ export class DataProcessor {
   }
 
   customHandler(dataItem) {
-    console.log('custom', dataItem);
     let nameField = this.panel.xaxis.name;
     if (!nameField) {
       throw {message: 'No field name specified to use for x-axis, check your axes settings'};
     }
-
-    //   let valueField = this.panel.xaxis.esValueField;
-    //   let datapoints = _.map(seriesData.datapoints, (doc) => {
-    //     return [
-    //       pluckDeep(doc, valueField),  // Y value
-    //       pluckDeep(doc, xField)       // X value
-    //     ];
-    //   });
-    //
-    //   // Remove empty points
-    //   datapoints = _.filter(datapoints, (point) => {
-    //     return point[0] !== undefined;
-    //   });
-    //
-    //   var alias = valueField;
-    //   re
     return [];
   }
 
-  // tableHandler(seriesData, index) {
-  //   var xColumnIndex = Number(this.panel.xaxis.columnIndex);
-  //   var valueColumnIndex = Number(this.panel.xaxis.valueColumnIndex);
-  //   var datapoints = _.map(seriesData.rows, (row) => {
-  //     var value = valueColumnIndex ? row[valueColumnIndex] : _.last(row);
-  //     return [
-  //       value,             // Y value
-  //       row[xColumnIndex]  // X value
-  //     ];
-  //   });
-  //
-  //   var alias = seriesData.columns[valueColumnIndex].text;
-  //
-  //   return this.seriesHandler(seriesData, index, datapoints, alias);
-  // }
-
-  // esRawDocHandler(seriesData, index) {
-  //   let xField = this.panel.xaxis.esField;
-  //   let valueField = this.panel.xaxis.esValueField;
-  //   let datapoints = _.map(seriesData.datapoints, (doc) => {
-  //     return [
-  //       pluckDeep(doc, valueField),  // Y value
-  //       pluckDeep(doc, xField)       // X value
-  //     ];
-  //   });
-  //
-  //   // Remove empty points
-  //   datapoints = _.filter(datapoints, (point) => {
-  //     return point[0] !== undefined;
-  //   });
-  //
-  //   var alias = valueField;
-  //   return this.seriesHandler(seriesData, index, datapoints, alias);
-  // }
-
   validateXAxisSeriesValue() {
     switch (this.panel.xaxis.mode) {
       case 'series': {