diff --git a/app/assets/javascripts/components/pf_charts/trends-chart.component.js b/app/assets/javascripts/components/pf_charts/trends-chart.component.js
index 29a700ce25dd..e81a2cce644e 100644
--- a/app/assets/javascripts/components/pf_charts/trends-chart.component.js
+++ b/app/assets/javascripts/components/pf_charts/trends-chart.component.js
@@ -4,14 +4,14 @@ angular.module( 'patternfly.charts' ).component('pfTrendsChart', {
     chartData: '<',
     chartHeight: '<?',
     showXAxis: '<?',
-    showYAxis: '<?'
+    showYAxis: '<?',
   },
   templateUrl: '/static/pf_charts/trends-chart.html.haml',
   controller: trendsChartController,
 });
-trendsChartController.$inject = ['pfUtils'];
+trendsChartController.$inject = [];
 
-function trendsChartController(pfUtils) {
+function trendsChartController() {
   'use strict';
   var vm = this;
   var prevChartData;
@@ -19,18 +19,18 @@ function trendsChartController(pfUtils) {
   var SMALL = 30;
   var LARGE = 60;
 
-  vm.updateAll = function () {
+  vm.updateAll = function() {
     // Need to deep watch changes
     prevChartData = angular.copy(vm.chartData);
     prevConfig = angular.copy(vm.config);
 
-    vm.showLargeCardLayout = (!vm.config.layout || vm.config.layout === 'large');
+    vm.showLargeCardLayout = (! vm.config.layout || vm.config.layout === 'large');
     vm.showSmallCardLayout = (vm.config.layout === 'small');
-    vm.showActualValue = (!vm.config.valueType || vm.config.valueType === 'actual');
+    vm.showActualValue = (! vm.config.valueType || vm.config.valueType === 'actual');
     vm.showPercentageValue = (vm.config.valueType === 'percentage');
   };
 
-  vm.getPercentageValue = function () {
+  vm.getPercentageValue = function() {
     var pctValue = 0;
 
     if (vm.chartData.dataAvailable !== false && vm.chartData.total > 0) {
@@ -38,14 +38,14 @@ function trendsChartController(pfUtils) {
     }
     return pctValue;
   };
-  vm.getLatestValue = function () {
+  vm.getLatestValue = function() {
     var latestValue = 0;
     if (vm.chartData.yData && vm.chartData.yData.length > 0) {
       latestValue = vm.chartData.yData[vm.chartData.yData.length - 1];
     }
     return latestValue;
   };
-  vm.getChartHeight = function () {
+  vm.getChartHeight = function() {
     var retValue = LARGE;
     if (vm.chartHeight) {
       retValue = vm.chartHeight;
@@ -55,13 +55,13 @@ function trendsChartController(pfUtils) {
     return retValue;
   };
 
-  vm.$onChanges = function (changesObj) {
+  vm.$onChanges = function() {
     vm.updateAll();
   };
 
-  vm.$doCheck = function () {
+  vm.$doCheck = function() {
     // do a deep compare on chartData and config
-    if (!angular.equals(vm.chartData, prevChartData) || !angular.equals(vm.config, prevConfig)) {
+    if (! angular.equals(vm.chartData, prevChartData) || ! angular.equals(vm.config, prevConfig)) {
       vm.updateAll();
     }
   };
diff --git a/app/assets/javascripts/controllers/ems_container_dashboard/aggregate_status_card_controller.js b/app/assets/javascripts/controllers/ems_container_dashboard/aggregate_status_card_controller.js
index ef5aa27a8868..7056919cf794 100644
--- a/app/assets/javascripts/controllers/ems_container_dashboard/aggregate_status_card_controller.js
+++ b/app/assets/javascripts/controllers/ems_container_dashboard/aggregate_status_card_controller.js
@@ -24,17 +24,6 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
     "images": "pficon pficon-image",
     "routes": "pficon pficon-route",
   };
-//
-//   var attrUrl = {
-//     "nodes": "container_node",
-//     "containers": "container",
-//     "registries": "container_image_registry",
-//     "projects": "container_project",
-//     "pods": "container_group",
-//     "services": "container_service",
-//     "images": "container_image",
-//     "routes": "container_route",
-//   };
 
   var init = function() {
     ManageIQ.angular.scope = vm;
@@ -47,7 +36,7 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
       .catch(miqService.handleFailure);
 
     $q.all([promiseProviderData]).then(function() {
-      data = vm.provider.data.data
+      var data = vm.provider.data.data
 
       vm.status = {
         "iconImage": data.providers[0].iconImage,
@@ -56,27 +45,27 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
           {
             "iconImage": data.providers[0].statusIcon,
           },
-        ]
+        ],
       };
 
       vm.alertStatus = {
         "title": "Alerts",
-        "notifications":[
+        "notifications": [
           {
             "iconClass": data.alerts.notifications[0].iconClass,
           },
-        ]
+        ],
       };
 
       vm.AggStatus = [];
       for (var i = 0; i < attributes.length; i++) {
-        data_status = data.status[attributes[i]];
+        var dataStatus = data.status[attributes[i]];
         vm.AggStatus.push({
           "id": attributes[i] + '_' + providerId,
           "iconClass": attrIconHsh[attributes[i]],
           "title": attrHsh[attributes[i]],
-          "count": data_status.count,
-          "href": data_status.href,
+          "count": dataStatus.count,
+          "href": dataStatus.href,
           "notification": {
             "iconClass": "pficon pficon-error-circle-o",
             "count": 0,
diff --git a/app/assets/javascripts/controllers/ems_container_dashboard/recent_pods_line_chart_controller.js b/app/assets/javascripts/controllers/ems_container_dashboard/recent_pods_line_chart_controller.js
index 71b17a21d4c3..428e7f55c879 100644
--- a/app/assets/javascripts/controllers/ems_container_dashboard/recent_pods_line_chart_controller.js
+++ b/app/assets/javascripts/controllers/ems_container_dashboard/recent_pods_line_chart_controller.js
@@ -1,12 +1,11 @@
 /* global miqHttpInject */
-angular.module( 'patternfly.charts' ).controller( 'recentPodsLineChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', 'dashboardUtilsFactory', function($q, providerId, $http, chartsMixin, miqService, dashboardUtilsFactory) {
+angular.module( 'patternfly.charts' ).controller( 'recentPodsLineChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
   var vm = this;
   vm.id = "recentPodsLineChart_" + providerId;
   vm.lineChartId = vm.id
   var init = function() {
     ManageIQ.angular.scope = vm;
     vm.loadingDone = false;
-    //vm.config = chartsMixin.chartConfig.hourlyPodUsageConfig;
     vm.timeframeLabel = __('Last 30 Days');
     var url = '/container_dashboard/pod_metrics_data/' + providerId;
     var podsDataPromise = $http.get(url)
diff --git a/app/assets/javascripts/controllers/ems_container_dashboard/trends_chart_controller.js b/app/assets/javascripts/controllers/ems_container_dashboard/trends_chart_controller.js
index 9e8bdc7646b8..28c1589f65b7 100644
--- a/app/assets/javascripts/controllers/ems_container_dashboard/trends_chart_controller.js
+++ b/app/assets/javascripts/controllers/ems_container_dashboard/trends_chart_controller.js
@@ -1,6 +1,5 @@
 /* global miqHttpInject */
 angular.module( 'patternfly.card' ).controller('trendsChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
-//angular.module('trendChartController', ['patternfly.charts', 'patternfly.card', 'ui.bootstrap'] ).controller('trendChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
   var vm = this;
   vm.id = "trendsChart_" + providerId;
   var init = function() {
@@ -29,7 +28,7 @@ angular.module( 'patternfly.card' ).controller('trendsChartController', ['$q', '
         vm.data.dataAvailable = false;
       } else {
         if (data.xy_data != null) {
-          data.xy_data.xData = data.xy_data.xData.map(function (date) {
+          data.xy_data.xData = data.xy_data.xData.map(function(date) {
             return chartsMixin.parseDate(date);
           });
         }
diff --git a/app/assets/javascripts/controllers/ems_container_dashboard/utilization_trend_chart_controller.js b/app/assets/javascripts/controllers/ems_container_dashboard/utilization_trend_chart_controller.js
index e0d72edf81e7..80097e643744 100644
--- a/app/assets/javascripts/controllers/ems_container_dashboard/utilization_trend_chart_controller.js
+++ b/app/assets/javascripts/controllers/ems_container_dashboard/utilization_trend_chart_controller.js
@@ -1,4 +1,4 @@
-angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainerController', ['$q', 'providerId', 'chartsMixin', '$http', 'miqService', 'dashboardUtilsFactory', function($q, providerId, chartsMixin, $http, miqService, dashboardUtilsFactory) {
+angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainerController', ['$q', 'providerId', 'chartsMixin', '$http', 'miqService', function($q, providerId, chartsMixin, $http, miqService) {
   var vm = this;
 
   var init = function() {
@@ -34,22 +34,22 @@ angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainer
     };
   };
 
-  var processMetricsData = function(metricsDataStruct, all_data) {
-    var data = all_data.xy_data;
+  var processMetricsData = function(metricsDataStruct, allData) {
+    var data = allData.xy_data;
 
-    if (all_data.interval_name === 'hourly') {
+    if (allData.interval_name === 'hourly') {
       vm.timeframeLabel = __('Last 24 hours');
-    } else if (all_data.interval_name === 'realtime') {
+    } else if (allData.interval_name === 'realtime') {
       vm.timeframeLabel = __('Last 10 minutes');
     } else {
       vm.timeframeLabel = __('Last 30 Days');
     }
 
-    if (all_data.xy_data.cpu != null) {
-      all_data.xy_data.cpu.xData = all_data.xy_data.cpu.xData.map(function(date) {
+    if (allData.xy_data.cpu != null) {
+      allData.xy_data.cpu.xData = allData.xy_data.cpu.xData.map(function(date) {
         return chartsMixin.parseDate(date);
       });
-      all_data.xy_data.memory.xData = all_data.xy_data.memory.xData.map(function(date) {
+      allData.xy_data.memory.xData = allData.xy_data.memory.xData.map(function(date) {
         return chartsMixin.parseDate(date);
       });
     }
@@ -66,7 +66,7 @@ angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainer
             },
           };
         } else {
-          if (all_data.interval_name !== 'daily') {
+          if (allData.interval_name !== 'daily') {
             vm.cpuUsageSparklineConfig.tooltipFn = chartsMixin.hourlyTimeTooltip;
             vm.memoryUsageSparklineConfig.tooltipFn = chartsMixin.hourlyTimeTooltip;
           }
diff --git a/app/assets/javascripts/controllers/mixins/charts-mixin.js b/app/assets/javascripts/controllers/mixins/charts-mixin.js
index 9dc3109697d6..547ea7a8b928 100644
--- a/app/assets/javascripts/controllers/mixins/charts-mixin.js
+++ b/app/assets/javascripts/controllers/mixins/charts-mixin.js
@@ -119,79 +119,79 @@ angular.module('miq.util').factory('chartsMixin', ['$document', 'pfUtils', funct
       setAreaChart: true,
     },
     dailyNetworkUsageConfig: {
-      chartId  : 'networkUsageDailyChart',
+      chartId: 'networkUsageDailyChart',
       headTitle: __('Network Utilization Trend'),
       timeFrame: __('Last 30 Days'),
-      units    : __('KBps'),
-      dataName : __('KBps'),
-      tooltipFn  : dailyTimeTooltip,
+      units: __('KBps'),
+      dataName: __('KBps'),
+      tooltipFn: dailyTimeTooltip,
     },
     hourlyNetworkUsageConfig: {
-      chartId  : 'networkUsageHourlyChart',
+      chartId: 'networkUsageHourlyChart',
       headTitle: __('Network Utilization Trend'),
       timeFrame: __('Last 24 Hours'),
-      units    : __('KBps'),
-      dataName : __('KBps'),
-      tooltipFn  : hourlyTimeTooltip,
+      units: __('KBps'),
+      dataName: __('KBps'),
+      tooltipFn: hourlyTimeTooltip,
     },
     dailyPodUsageConfig: {
-      chartId     : 'podUsageDailyChart',
-      headTitle   : __('Pod Creation and Deletion Trends'),
-      timeFrame   : __('Last 30 days'),
+      chartId: 'podUsageDailyChart',
+      headTitle: __('Pod Creation and Deletion Trends'),
+      timeFrame: __('Last 30 days'),
       createdLabel: __('Created'),
       deletedLabel: __('Deleted'),
-      tooltip     : {
+      tooltip: {
         contents: dailyPodTimeTooltip,
         position: lineChartTooltipPositionFactory('podUsageDailyChart'),
       },
-      point       : {r: 1},
-      size        : {height: 145},
-      color       : {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
-      grid        : {y: {show: false}},
+      point: {r: 1},
+      size: {height: 145},
+      color: {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
+      grid: {y: {show: false}},
       setAreaChart: true,
     },
     hourlyPodUsageConfig: {
-      chartId     : 'podUsageHourlyChart',
-      headTitle   : __('Pod Creation and Deletion Trends'),
-      timeFrame   : __('Last 24 hours'),
+      chartId: 'podUsageHourlyChart',
+      headTitle: __('Pod Creation and Deletion Trends'),
+      timeFrame: __('Last 24 hours'),
       createdLabel: __('Created'),
       deletedLabel: __('Deleted'),
-      tooltip     : {
+      tooltip: {
         contents: hourlyPodTimeTooltip,
         position: lineChartTooltipPositionFactory('podUsageHourlyChart'),
       },
-      point       : {r: 1},
-      size        : {height: 145},
-      color       : {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
-      grid        : {y: {show: false}},
+      point: {r: 1},
+      size: {height: 145},
+      color: {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
+      grid: {y: {show: false}},
       setAreaChart: true,
     },
     dailyImageUsageConfig: {
-      chartId     : 'imageUsageDailyChart',
-      headTitle   : __('New Image Usage Trend'),
-      timeFrame   : __('Last 30 days'),
+      chartId: 'imageUsageDailyChart',
+      headTitle: __('New Image Usage Trend'),
+      timeFrame: __('Last 30 days'),
       createdLabel: __('Images'),
-      tooltip     : {
+      tooltip: {
         contents: dailyTimeTooltip,
         position: lineChartTooltipPositionFactory('imageUsageDailyChart'),
       },
-      point       : {r: 1},
-      size        : {height: 93},
-      grid        : {y: {show: false}},
+      point: {r: 1},
+      size: {height: 93},
+      grid: {y: {show: false}},
       setAreaChart: true,
     },
     hourlyImageUsageConfig: {
-      chartId     : 'imageUsageHourlyChart',
-      headTitle   : __('New Image Usage Trend'),
-      timeFrame   : __('Last 24 hours'),
+      chartId: 'imageUsageHourlyChart',
+      headTitle: __('New Image Usage Trend'),
+      timeFrame: __('Last 24 hours'),
       createdLabel: __('Images'),
       tooltip     : {
         contents: hourlyTimeTooltip,
         position: lineChartTooltipPositionFactory('imageUsageHourlyChart'),
       },
-      point       : {r: 1},
-      size        : {height: 93},
-      grid        : {y: {show: false}},
+      point: {r: 1},
+      size: {height: 93},
+      grid: {y: {show: false}},
       setAreaChart: true,
     },
   };
diff --git a/app/controllers/container_dashboard_controller.rb b/app/controllers/container_dashboard_controller.rb
index b2a528a67e56..10b67792928c 100644
--- a/app/controllers/container_dashboard_controller.rb
+++ b/app/controllers/container_dashboard_controller.rb
@@ -89,10 +89,6 @@ def collect_image_metrics_data(provider_id)
     ContainerDashboardService.new(provider_id, self).image_metrics_data
   end
 
-  def collect_network_metrics_data(provider_id)
-    ContainerDashboardService.new(provider_id, self).network_metrics_data
-  end
-
   def collect_live_data(provider_id, query)
     ems = ExtManagementSystem.find(provider_id)