diff --git a/public/app/core/directives/plugin_directive_loader.ts b/public/app/core/directives/plugin_directive_loader.ts
index b6abb91b065..4456afacbe1 100644
--- a/public/app/core/directives/plugin_directive_loader.ts
+++ b/public/app/core/directives/plugin_directive_loader.ts
@@ -56,7 +56,6 @@ function pluginDirectiveLoader($compile, datasourceSrv) {
   }
 
   function appendAndCompile(scope, elem, componentInfo) {
-    console.log('compile', elem, componentInfo);
     var child = angular.element(document.createElement(componentInfo.name));
     _.each(componentInfo.attrs, (value, key) => {
       child.attr(key, value);
diff --git a/public/app/features/datasources/edit_ctrl.js b/public/app/features/datasources/edit_ctrl.js
index 2bd86e5f385..c3242f5b565 100644
--- a/public/app/features/datasources/edit_ctrl.js
+++ b/public/app/features/datasources/edit_ctrl.js
@@ -10,7 +10,10 @@ function (angular, _, config) {
   var datasourceTypes = [];
 
   module.directive('datasourceHttpSettings', function() {
-    return {templateUrl: 'public/app/features/datasources/partials/http_settings.html'};
+    return {
+      scope: {current: "="},
+      templateUrl: 'public/app/features/datasources/partials/http_settings.html'
+    };
   });
 
   module.controller('DataSourceEditCtrl', function($scope, $q, backendSrv, $routeParams, $location, datasourceSrv) {
diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 5b9facb83a8..c27be475bd5 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -46,8 +46,6 @@
 				</plugin-directive-loader>
 			</div>
 
-			<!-- <ds&#45;config&#45;view ds&#45;meta="datasourceMeta" current="current"></ds&#45;config&#45;view> -->
-
 			<div ng-if="testing" style="margin-top: 25px">
 				<h5 ng-show="!testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
 				<h5 ng-show="testing.done">Test results</h5>
diff --git a/public/app/plugins/datasource/graphite/partials/config.html b/public/app/plugins/datasource/graphite/partials/config.html
index 9f5259cb2ea..d7a0f739ccb 100644
--- a/public/app/plugins/datasource/graphite/partials/config.html
+++ b/public/app/plugins/datasource/graphite/partials/config.html
@@ -1,2 +1,3 @@
-<datasource-http-settings></datasource-http-settings>
+<datasource-http-settings current="ctrl.current">
+</datasource-http-settings>
 
diff --git a/public/app/plugins/datasource/prometheus/partials/config.html b/public/app/plugins/datasource/prometheus/partials/config.html
index 9f5259cb2ea..d7a0f739ccb 100644
--- a/public/app/plugins/datasource/prometheus/partials/config.html
+++ b/public/app/plugins/datasource/prometheus/partials/config.html
@@ -1,2 +1,3 @@
-<datasource-http-settings></datasource-http-settings>
+<datasource-http-settings current="ctrl.current">
+</datasource-http-settings>