--- a/b2g/chrome/content/devtools/hud.js
+++ b/b2g/chrome/content/devtools/hud.js
@@ -312,72 +312,17 @@ Target.prototype = {
       if (addonHist.sum > 0) {
         payload.addonHistograms[appName][histName] = addonHist;
       }
     });
     shell.sendEvent(frame, 'advanced-telemetry-update', Cu.cloneInto(payload, frame));
   },
 
   _logHistogram(metric) {
-    if (!developerHUD._telemetry || metric.skipTelemetry) {
-      return;
-    }
-
-    metric.appName = this.appName;
-    if (!metric.appName) {
-      return;
-    }
-
-    let metricName = metric.name.toUpperCase();
-    let metricAppName = metric.appName.toUpperCase();
-    if (!metric.custom) {
-      let keyedMetricName = 'DEVTOOLS_HUD_' + metricName;
-      try {
-        let keyed = Services.telemetry.getKeyedHistogramById(keyedMetricName);
-        if (keyed) {
-          keyed.add(metric.appName, parseInt(metric.value, 10));
-          developerHUD._histograms.add(keyedMetricName);
-          telemetryDebug(keyedMetricName, metric.value, metric.appName);
-        }
-      } catch(err) {
-        console.error('Histogram error is metricname added to histograms.json:'
-          + keyedMetricName);
-      }
-    } else {
-      let histogramName = CUSTOM_HISTOGRAM_PREFIX + metricAppName + '_'
-        + metricName;
-      // This is a call to add a value to an existing histogram.
-      if (typeof metric.value !== 'undefined') {
-        Services.telemetry.getAddonHistogram(metricAppName,
-          CUSTOM_HISTOGRAM_PREFIX + metricName).add(parseInt(metric.value, 10));
-        telemetryDebug(histogramName, metric.value);
-        return;
-      }
-
-      // The histogram already exists and are not adding data to it.
-      if (developerHUD._customHistograms.has(histogramName)) {
-        return;
-      }
-
-      // This is a call to create a new histogram.
-      try {
-        let metricType = parseInt(metric.type, 10);
-        if (metricType === Services.telemetry.HISTOGRAM_COUNT) {
-          Services.telemetry.registerAddonHistogram(metricAppName,
-            CUSTOM_HISTOGRAM_PREFIX + metricName, metricType);
-        } else {
-          Services.telemetry.registerAddonHistogram(metricAppName,
-            CUSTOM_HISTOGRAM_PREFIX + metricName, metricType, metric.min,
-            metric.max, metric.buckets);
-        }
-        developerHUD._customHistograms.add(histogramName);
-      } catch (err) {
-        console.error('Histogram error: ' + err);
-      }
-    }
+    //method left as no-op as histograms are not in use anymore.
   }
 };
 
 
 /**
  * The Console Watcher tracks the following metrics in apps: reflows, warnings,
  * and errors, with security errors reported separately.
  */

--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9618,206 +9618,16 @@
   "GRAPHICS_SANITY_TEST_OS_SNAPSHOT": {
     "alert_emails": ["gfx-telemetry-alerts@mozilla.com","danderson@mozilla.com","msreckovic@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 10,
     "releaseChannelCollection": "opt-out",
     "description": "Reports whether the graphics sanity test passed an OS snapshot test. 0=Pass, 1=Fail, 2=Error, 3=Timed out."
   },
-  "DEVTOOLS_HUD_JANK": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "exponential",
-    "keyed": true,
-    "description": "The duration which a thread is blocked in ms, keyed by appName.",
-    "high": 5000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_REFLOW_DURATION": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "exponential",
-    "keyed": true,
-    "description": "The duration a reflow takes in ms, keyed by appName.",
-    "high": 1000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_REFLOWS": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "count",
-    "keyed": true,
-    "description": "A count of the number of reflows, keyed by appName."
-  },
-  "DEVTOOLS_HUD_SECURITY_CATEGORY": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "enumerated",
-    "keyed": true,
-    "description": "The security error enums, keyed by appName.",
-    "n_values": 8
-  },
-  "DEVTOOLS_HUD_ERRORS": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "count",
-    "keyed": true,
-    "description": "Number of errors, keyed by appName."
-  },
-  "DEVTOOLS_HUD_WARNINGS": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "count",
-    "keyed": true,
-    "description": "Number of warnings, keyed by appName."
-  },
-  "DEVTOOLS_HUD_USS": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "low": 20000000,
-    "high": 100000000,
-    "n_buckets": 52,
-    "description": "The USS memory consumed by an application, keyed by appName."
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_CONTENTINTERACTIVE": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'contentInteractive' performance mark, keyed by appName.",
-    "high": 2000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONINTERACTIVE": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'navigationInteractive' performance mark, keyed by appName.",
-    "high": 3000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONLOADED": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'navigationLoaded' performance mark, keyed by appName.",
-    "high": 4000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_VISUALLYLOADED": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'visuallyLoaded' performance mark, keyed by appName.",
-    "high": 5000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_MEDIAENUMERATED": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'mediaEnumerated' performance mark, keyed by appName.",
-    "high": 5000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_FULLYLOADED": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'fullyLoaded' performance mark, keyed by appName.",
-    "high": 30000,
-    "n_buckets": 30
-  },
-  "DEVTOOLS_HUD_APP_STARTUP_TIME_SCANEND": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The duration in ms between application launch and the 'scanEnd' performance mark, keyed by appName.",
-    "high": 30000,
-    "n_buckets": 30
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_CONTENTINTERACTIVE_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'contentInteractive' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 30000000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONINTERACTIVE_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'navigationInteractive' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 30000000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONLOADED_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'navigationLoaded' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 30000000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_VISUALLYLOADED_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'visuallyLoaded' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 30000000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_MEDIAENUMERATED_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'mediaEnumerated' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 40000000,
-    "n_buckets": 10
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_FULLYLOADED_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'fullyLoaded' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 40000000,
-    "n_buckets": 20
-  },
-  "DEVTOOLS_HUD_APP_MEMORY_SCANEND_V2": {
-    "alert_emails": ["rnicoletti@mozilla.com","thills@mozilla.com"],
-    "expires_in_version": "52",
-    "kind": "linear",
-    "keyed": true,
-    "description": "The USS memory consumed by an application at the time of the 'scanEnd' performance mark, keyed by appName.",
-    "low": 20000000,
-    "high": 40000000,
-    "n_buckets": 20
-  },
   "DEVTOOLS_MEMORY_TAKE_SNAPSHOT_COUNT": {
     "expires_in_version": "56",
     "kind": "count",
     "bug_numbers": [1221619],
     "description": "The number of heap snapshots taken by a user"
   },
   "DEVTOOLS_MEMORY_IMPORT_SNAPSHOT_COUNT": {
     "expires_in_version": "56",

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -888,37 +888,16 @@
     "DEVTOOLS_COMPUTEDVIEW_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_CUSTOM_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_DEBUGGER_DISPLAY_SOURCE_LOCAL_MS",
     "DEVTOOLS_DEBUGGER_DISPLAY_SOURCE_REMOTE_MS",
     "DEVTOOLS_DEVELOPERTOOLBAR_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_FONTINSPECTOR_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_HEAP_SNAPSHOT_EDGE_COUNT",
     "DEVTOOLS_HEAP_SNAPSHOT_NODE_COUNT",
-    "DEVTOOLS_HUD_APP_MEMORY_CONTENTINTERACTIVE_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_FULLYLOADED_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_MEDIAENUMERATED_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONINTERACTIVE_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_NAVIGATIONLOADED_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_SCANEND_V2",
-    "DEVTOOLS_HUD_APP_MEMORY_VISUALLYLOADED_V2",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_CONTENTINTERACTIVE",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_FULLYLOADED",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_MEDIAENUMERATED",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONINTERACTIVE",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_NAVIGATIONLOADED",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_SCANEND",
-    "DEVTOOLS_HUD_APP_STARTUP_TIME_VISUALLYLOADED",
-    "DEVTOOLS_HUD_ERRORS",
-    "DEVTOOLS_HUD_JANK",
-    "DEVTOOLS_HUD_REFLOWS",
-    "DEVTOOLS_HUD_REFLOW_DURATION",
-    "DEVTOOLS_HUD_SECURITY_CATEGORY",
-    "DEVTOOLS_HUD_USS",
-    "DEVTOOLS_HUD_WARNINGS",
     "DEVTOOLS_INSPECTOR_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_JSBROWSERDEBUGGER_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_JSDEBUGGER_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_JSPROFILER_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_MEMORY_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_NETMONITOR_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_OPTIONS_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_OS_ENUMERATED_PER_USER",