diff --git a/devtools/client/debugger/debugger-commands.js b/devtools/client/debugger/debugger-commands.js
deleted file mode 100644
index 3229646f8cd0..000000000000
--- a/devtools/client/debugger/debugger-commands.js
+++ /dev/null
@@ -1,633 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const { Cc, Ci, Cu } = require("chrome");
-const l10n = require("gcli/l10n");
-loader.lazyRequireGetter(this, "gDevTools",
-                         "devtools/client/framework/devtools", true);
-
-/**
- * The commands and converters that are exported to GCLI
- */
-exports.items = [];
-
-/**
- * Utility to get access to the current breakpoint list.
- *
- * @param DebuggerPanel dbg
- *        The debugger panel.
- * @return array
- *         An array of objects, one for each breakpoint, where each breakpoint
- *         object has the following properties:
- *           - url: the URL of the source file.
- *           - label: a unique string identifier designed to be user visible.
- *           - lineNumber: the line number of the breakpoint in the source file.
- *           - lineText: the text of the line at the breakpoint.
- *           - truncatedLineText: lineText truncated to MAX_LINE_TEXT_LENGTH.
- */
-function getAllBreakpoints(dbg) {
-  let breakpoints = [];
-  let sources = dbg._view.Sources;
-  let { trimUrlLength: trim } = dbg.panelWin.SourceUtils;
-
-  for (let source of sources) {
-    for (let { attachment: breakpoint } of source) {
-      breakpoints.push({
-        url: source.attachment.source.url,
-        label: source.attachment.label + ":" + breakpoint.line,
-        lineNumber: breakpoint.line,
-        lineText: breakpoint.text,
-        truncatedLineText: trim(breakpoint.text, MAX_LINE_TEXT_LENGTH, "end")
-      });
-    }
-  }
-
-  return breakpoints;
-}
-
-function getAllSources(dbg) {
-  if (!dbg) {
-    return [];
-  }
-
-  let items = dbg._view.Sources.items;
-  return items
-    .filter(item => !!item.attachment.source.url)
-    .map(item => ({
-      name: item.attachment.source.url,
-      value: item.attachment.source.actor
-    }));
-}
-
-/**
- * 'break' command
- */
-exports.items.push({
-  name: "break",
-  description: l10n.lookup("breakDesc"),
-  manual: l10n.lookup("breakManual")
-});
-
-/**
- * 'break list' command
- */
-exports.items.push({
-  name: "break list",
-  item: "command",
-  runAt: "client",
-  description: l10n.lookup("breaklistDesc"),
-  returnType: "breakpoints",
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger", { ensureOpened: true });
-    return dbg.then(getAllBreakpoints);
-  }
-});
-
-exports.items.push({
-  item: "converter",
-  from: "breakpoints",
-  to: "view",
-  exec: function (breakpoints, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (dbg && breakpoints.length) {
-      return context.createView({
-        html: breakListHtml,
-        data: {
-          breakpoints: breakpoints,
-          onclick: context.update,
-          ondblclick: context.updateExec
-        }
-      });
-    } else {
-      return context.createView({
-        html: "<p>${message}</p>",
-        data: { message: l10n.lookup("breaklistNone") }
-      });
-    }
-  }
-});
-
-var breakListHtml = "" +
-      "<table>" +
-      " <thead>" +
-      "  <th>Source</th>" +
-      "  <th>Line</th>" +
-      "  <th>Actions</th>" +
-      " </thead>" +
-      " <tbody>" +
-      "  <tr foreach='breakpoint in ${breakpoints}'>" +
-      "    <td class='gcli-breakpoint-label'>${breakpoint.label}</td>" +
-      "    <td class='gcli-breakpoint-lineText'>" +
-      "      ${breakpoint.truncatedLineText}" +
-      "    </td>" +
-      "    <td>" +
-      "      <span class='gcli-out-shortcut'" +
-      "            data-command='break del ${breakpoint.label}'" +
-      "            onclick='${onclick}'" +
-      "            ondblclick='${ondblclick}'>" +
-      "        " + l10n.lookup("breaklistOutRemove") + "</span>" +
-      "    </td>" +
-      "  </tr>" +
-      " </tbody>" +
-      "</table>" +
-      "";
-
-var MAX_LINE_TEXT_LENGTH = 30;
-var MAX_LABEL_LENGTH = 20;
-
-/**
- * 'break add' command
- */
-exports.items.push({
-  name: "break add",
-  description: l10n.lookup("breakaddDesc"),
-  manual: l10n.lookup("breakaddManual")
-});
-
-/**
- * 'break add line' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "break add line",
-  description: l10n.lookup("breakaddlineDesc"),
-  params: [
-    {
-      name: "file",
-      type: {
-        name: "selection",
-        lookup: function (context) {
-          return getAllSources(getPanel(context, "jsdebugger"));
-        }
-      },
-      description: l10n.lookup("breakaddlineFileDesc")
-    },
-    {
-      name: "line",
-      type: { name: "number", min: 1, step: 10 },
-      description: l10n.lookup("breakaddlineLineDesc")
-    }
-  ],
-  returnType: "string",
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let deferred = context.defer();
-    let item = dbg._view.Sources.getItemForAttachment(a => {
-      return a.source && a.source.actor === args.file;
-    });
-    let position = { actor: item.value, line: args.line };
-
-    dbg.addBreakpoint(position).then(() => {
-      deferred.resolve(l10n.lookup("breakaddAdded"));
-    }, aError => {
-      deferred.resolve(l10n.lookupFormat("breakaddFailed", [aError]));
-    });
-
-    return deferred.promise;
-  }
-});
-
-/**
- * 'break del' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "break del",
-  description: l10n.lookup("breakdelDesc"),
-  params: [
-    {
-      name: "breakpoint",
-      type: {
-        name: "selection",
-        lookup: function (context) {
-          let dbg = getPanel(context, "jsdebugger");
-          if (!dbg) {
-            return [];
-          }
-          return getAllBreakpoints(dbg).map(breakpoint => ({
-            name: breakpoint.label,
-            value: breakpoint,
-            description: breakpoint.truncatedLineText
-          }));
-        }
-      },
-      description: l10n.lookup("breakdelBreakidDesc")
-    }
-  ],
-  returnType: "string",
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let source = dbg._view.Sources.getItemForAttachment(a => {
-      return a.source && a.source.url === args.breakpoint.url;
-    });
-
-    let deferred = context.defer();
-    let position = { actor: source.attachment.source.actor,
-                     line: args.breakpoint.lineNumber };
-
-    dbg.removeBreakpoint(position).then(() => {
-      deferred.resolve(l10n.lookup("breakdelRemoved"));
-    }, () => {
-      deferred.resolve(l10n.lookup("breakNotFound"));
-    });
-
-    return deferred.promise;
-  }
-});
-
-/**
- * 'dbg' command
- */
-exports.items.push({
-  name: "dbg",
-  description: l10n.lookup("dbgDesc"),
-  manual: l10n.lookup("dbgManual")
-});
-
-/**
- * 'dbg open' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg open",
-  description: l10n.lookup("dbgOpen"),
-  params: [],
-  exec: function (args, context) {
-    let target = context.environment.target;
-    return gDevTools.showToolbox(target, "jsdebugger").then(() => null);
-  }
-});
-
-/**
- * 'dbg close' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg close",
-  description: l10n.lookup("dbgClose"),
-  params: [],
-  exec: function (args, context) {
-    if (!getPanel(context, "jsdebugger")) {
-      return;
-    }
-    let target = context.environment.target;
-    return gDevTools.closeToolbox(target).then(() => null);
-  }
-});
-
-/**
- * 'dbg interrupt' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg interrupt",
-  description: l10n.lookup("dbgInterrupt"),
-  params: [],
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let controller = dbg._controller;
-    let thread = controller.activeThread;
-    if (!thread.paused) {
-      thread.interrupt();
-    }
-  }
-});
-
-/**
- * 'dbg continue' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg continue",
-  description: l10n.lookup("dbgContinue"),
-  params: [],
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let controller = dbg._controller;
-    let thread = controller.activeThread;
-    if (thread.paused) {
-      thread.resume();
-    }
-  }
-});
-
-/**
- * 'dbg step' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg step",
-  description: l10n.lookup("dbgStepDesc"),
-  manual: l10n.lookup("dbgStepManual")
-});
-
-/**
- * 'dbg step over' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg step over",
-  description: l10n.lookup("dbgStepOverDesc"),
-  params: [],
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let controller = dbg._controller;
-    let thread = controller.activeThread;
-    if (thread.paused) {
-      thread.stepOver();
-    }
-  }
-});
-
-/**
- * 'dbg step in' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg step in",
-  description: l10n.lookup("dbgStepInDesc"),
-  params: [],
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let controller = dbg._controller;
-    let thread = controller.activeThread;
-    if (thread.paused) {
-      thread.stepIn();
-    }
-  }
-});
-
-/**
- * 'dbg step over' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg step out",
-  description: l10n.lookup("dbgStepOutDesc"),
-  params: [],
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerStopped");
-    }
-
-    let controller = dbg._controller;
-    let thread = controller.activeThread;
-    if (thread.paused) {
-      thread.stepOut();
-    }
-  }
-});
-
-/**
- * 'dbg list' command
- */
-exports.items.push({
-  item: "command",
-  runAt: "client",
-  name: "dbg list",
-  description: l10n.lookup("dbgListSourcesDesc"),
-  params: [],
-  returnType: "dom",
-  exec: function (args, context) {
-    let dbg = getPanel(context, "jsdebugger");
-    if (!dbg) {
-      return l10n.lookup("debuggerClosed");
-    }
-
-    let sources = getAllSources(dbg);
-    let doc = context.environment.chromeDocument;
-    let div = createXHTMLElement(doc, "div");
-    let ol = createXHTMLElement(doc, "ol");
-
-    sources.forEach(source => {
-      let li = createXHTMLElement(doc, "li");
-      li.textContent = source.name;
-      ol.appendChild(li);
-    });
-    div.appendChild(ol);
-
-    return div;
-  }
-});
-
-/**
- * Define the 'dbg blackbox' and 'dbg unblackbox' commands.
- */
-[
-  {
-    name: "blackbox",
-    clientMethod: "blackBox",
-    l10nPrefix: "dbgBlackBox"
-  },
-  {
-    name: "unblackbox",
-    clientMethod: "unblackBox",
-    l10nPrefix: "dbgUnBlackBox"
-  }
-].forEach(function (cmd) {
-  const lookup = function (id) {
-    return l10n.lookup(cmd.l10nPrefix + id);
-  };
-
-  exports.items.push({
-    item: "command",
-    runAt: "client",
-    name: "dbg " + cmd.name,
-    description: lookup("Desc"),
-    params: [
-      {
-        name: "source",
-        type: {
-          name: "selection",
-          lookup: function (context) {
-            return getAllSources(getPanel(context, "jsdebugger"));
-          }
-        },
-        description: lookup("SourceDesc"),
-        defaultValue: null
-      },
-      {
-        name: "glob",
-        type: "string",
-        description: lookup("GlobDesc"),
-        defaultValue: null
-      },
-      {
-        name: "invert",
-        type: "boolean",
-        description: lookup("InvertDesc")
-      }
-    ],
-    returnType: "dom",
-    exec: function (args, context) {
-      const dbg = getPanel(context, "jsdebugger");
-      const doc = context.environment.chromeDocument;
-      if (!dbg) {
-        throw new Error(l10n.lookup("debuggerClosed"));
-      }
-
-      const { promise, resolve, reject } = context.defer();
-      const { activeThread } = dbg._controller;
-      const globRegExp = args.glob ? globToRegExp(args.glob) : null;
-
-      // Filter the sources down to those that we will need to black box.
-
-      function shouldBlackBox(source) {
-        var value = globRegExp && globRegExp.test(source.url)
-          || args.source && source.actor == args.source;
-        return args.invert ? !value : value;
-      }
-
-      const toBlackBox = [];
-      for (let {attachment: {source}} of dbg._view.Sources.items) {
-        if (shouldBlackBox(source)) {
-          toBlackBox.push(source);
-        }
-      }
-
-      // If we aren't black boxing any sources, bail out now.
-
-      if (toBlackBox.length === 0) {
-        const empty = createXHTMLElement(doc, "div");
-        empty.textContent = lookup("EmptyDesc");
-        return void resolve(empty);
-      }
-
-      // Send the black box request to each source we are black boxing. As we
-      // get responses, accumulate the results in `blackBoxed`.
-
-      const blackBoxed = [];
-
-      for (let source of toBlackBox) {
-        dbg.blackbox(source, cmd.clientMethod === "blackBox").then(() => {
-          blackBoxed.push(source.url);
-        }, err => {
-          blackBoxed.push(lookup("ErrorDesc") + " " + source.url);
-        }).then(() => {
-          if (toBlackBox.length === blackBoxed.length) {
-            displayResults();
-          }
-        });
-      }
-
-      // List the results for the user.
-
-      function displayResults() {
-        const results = doc.createElement("div");
-        results.textContent = lookup("NonEmptyDesc");
-
-        const list = createXHTMLElement(doc, "ul");
-        results.appendChild(list);
-
-        for (let result of blackBoxed) {
-          const item = createXHTMLElement(doc, "li");
-          item.textContent = result;
-          list.appendChild(item);
-        }
-        resolve(results);
-      }
-
-      return promise;
-    }
-  });
-});
-
-/**
- * A helper to create xhtml namespaced elements.
- */
-function createXHTMLElement(document, tagname) {
-  return document.createElementNS("http://www.w3.org/1999/xhtml", tagname);
-}
-
-/**
- * A helper to go from a command context to a debugger panel.
- */
-function getPanel(context, id, options = {}) {
-  if (!context) {
-    return undefined;
-  }
-
-  let target = context.environment.target;
-
-  if (options.ensureOpened) {
-    return gDevTools.showToolbox(target, id).then(toolbox => {
-      return toolbox.getPanel(id);
-    });
-  } else {
-    let toolbox = gDevTools.getToolbox(target);
-    if (toolbox) {
-      return toolbox.getPanel(id);
-    } else {
-      return undefined;
-    }
-  }
-}
-
-/**
- * Converts a glob to a regular expression.
- */
-function globToRegExp(glob) {
-  const reStr = glob
-  // Escape existing regular expression syntax.
-    .replace(/\\/g, "\\\\")
-    .replace(/\//g, "\\/")
-    .replace(/\^/g, "\\^")
-    .replace(/\$/g, "\\$")
-    .replace(/\+/g, "\\+")
-    .replace(/\?/g, "\\?")
-    .replace(/\./g, "\\.")
-    .replace(/\(/g, "\\(")
-    .replace(/\)/g, "\\)")
-    .replace(/\=/g, "\\=")
-    .replace(/\!/g, "\\!")
-    .replace(/\|/g, "\\|")
-    .replace(/\{/g, "\\{")
-    .replace(/\}/g, "\\}")
-    .replace(/\,/g, "\\,")
-    .replace(/\[/g, "\\[")
-    .replace(/\]/g, "\\]")
-    .replace(/\-/g, "\\-")
-  // Turn * into the match everything wildcard.
-    .replace(/\*/g, ".*");
-  return new RegExp("^" + reStr + "$");
-}
diff --git a/devtools/client/debugger/moz.build b/devtools/client/debugger/moz.build
index c086c8a8cd2a..e65f38959c81 100644
--- a/devtools/client/debugger/moz.build
+++ b/devtools/client/debugger/moz.build
@@ -9,7 +9,6 @@ DIRS += [
 ]
 
 DevToolsModules(
-    'debugger-commands.js',
     'panel.js'
 )
 
diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 0a68884a5460..7bcd377fbac2 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -82,10 +82,6 @@ Tools.inspector = {
     return l10n("inspector.tooltip2", "Ctrl+Shift+") + l10n("inspector.commandkey");
   },
   inMenu: true,
-  commands: [
-    "devtools/client/responsive.html/commands",
-    "devtools/client/inspector/inspector-commands"
-  ],
 
   preventClosingOnKey: true,
   onkey: function(panel, toolbox) {
@@ -115,7 +111,6 @@ Tools.webConsole = {
     l10n("webconsole.commandkey"));
   },
   inMenu: true,
-  commands: "devtools/client/webconsole/console-commands",
 
   preventClosingOnKey: true,
   onkey: function(panel, toolbox) {
@@ -149,8 +144,6 @@ Tools.jsdebugger = {
     l10n("debugger.commandkey"));
   },
   inMenu: true,
-  commands: "devtools/client/debugger/debugger-commands",
-
   isTargetSupported: function() {
     return true;
   },
@@ -194,8 +187,6 @@ Tools.styleEditor = {
     "Shift+" + functionkey(l10n("styleeditor.commandkey")));
   },
   inMenu: true,
-  commands: "devtools/client/styleeditor/styleeditor-commands",
-
   isTargetSupported: function(target) {
     return target.hasActor("styleSheets");
   },
@@ -394,12 +385,9 @@ Tools.scratchpad = {
   panelLabel: l10n("scratchpad.panelLabel"),
   tooltip: l10n("scratchpad.tooltip"),
   inMenu: false,
-  commands: "devtools/client/scratchpad/scratchpad-commands",
-
   isTargetSupported: function(target) {
     return target.hasActor("console");
   },
-
   build: function(iframeWindow, toolbox) {
     return new ScratchpadPanel(iframeWindow, toolbox);
   }
diff --git a/devtools/client/inspector/inspector-commands.js b/devtools/client/inspector/inspector-commands.js
deleted file mode 100644
index ea5721c70cf7..000000000000
--- a/devtools/client/inspector/inspector-commands.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const l10n = require("gcli/l10n");
-const {gDevTools} = require("devtools/client/framework/devtools");
-/* eslint-disable mozilla/reject-some-requires */
-const {HighlighterEnvironment} = require("devtools/server/actors/highlighters");
-const {EyeDropper} = require("devtools/server/actors/highlighters/eye-dropper");
-/* eslint-enable mozilla/reject-some-requires */
-const Telemetry = require("devtools/client/shared/telemetry");
-
-const TELEMETRY_EYEDROPPER_OPENED = "DEVTOOLS_EYEDROPPER_OPENED_COUNT";
-const TELEMETRY_EYEDROPPER_OPENED_MENU = "DEVTOOLS_MENU_EYEDROPPER_OPENED_COUNT";
-
-const windowEyeDroppers = new WeakMap();
-
-exports.items = [{
-  item: "command",
-  runAt: "client",
-  name: "inspect",
-  description: l10n.lookup("inspectDesc"),
-  manual: l10n.lookup("inspectManual"),
-  params: [
-    {
-      name: "selector",
-      type: "string",
-      description: l10n.lookup("inspectNodeDesc"),
-      manual: l10n.lookup("inspectNodeManual")
-    }
-  ],
-  exec: async function(args, context) {
-    const target = context.environment.target;
-    const toolbox = await gDevTools.showToolbox(target, "inspector");
-    const walker = toolbox.getCurrentPanel().walker;
-    const rootNode = await walker.getRootNode();
-    const nodeFront = await walker.querySelector(rootNode, args.selector);
-    toolbox.getCurrentPanel().selection.setNodeFront(nodeFront, { reason: "gcli" });
-  },
-}, {
-  item: "command",
-  runAt: "client",
-  name: "eyedropper",
-  description: l10n.lookup("eyedropperDesc"),
-  manual: l10n.lookup("eyedropperManual"),
-  params: [{
-    // This hidden parameter is only set to true when the eyedropper browser menu item is
-    // used. It is useful to log a different telemetry event whether the tool was used
-    // from the menu, or from the gcli command line.
-    group: "hiddengroup",
-    params: [{
-      name: "frommenu",
-      type: "boolean",
-      hidden: true
-    }, {
-      name: "hide",
-      type: "boolean",
-      hidden: true
-    }]
-  }],
-  exec: async function(args, context) {
-    if (args.hide) {
-      context.updateExec("eyedropper_server_hide").catch(console.error);
-      return;
-    }
-
-    // If the inspector is already picking a color from the page, cancel it.
-    const target = context.environment.target;
-    const toolbox = gDevTools.getToolbox(target);
-    if (toolbox) {
-      const inspector = toolbox.getPanel("inspector");
-      if (inspector) {
-        await inspector.hideEyeDropper();
-      }
-    }
-
-    const telemetry = new Telemetry();
-    if (args.frommenu) {
-      telemetry.getHistogramById(TELEMETRY_EYEDROPPER_OPENED_MENU).add(true);
-    } else {
-      telemetry.getHistogramById(TELEMETRY_EYEDROPPER_OPENED).add(true);
-    }
-    context.updateExec("eyedropper_server").catch(console.error);
-  }
-}, {
-  item: "command",
-  runAt: "server",
-  name: "eyedropper_server",
-  hidden: true,
-  exec: function(args, {environment}) {
-    let eyeDropper = windowEyeDroppers.get(environment.window);
-
-    if (!eyeDropper) {
-      const env = new HighlighterEnvironment();
-      env.initFromWindow(environment.window);
-
-      eyeDropper = new EyeDropper(env);
-      eyeDropper.once("hidden", () => {
-        eyeDropper.destroy();
-        env.destroy();
-        windowEyeDroppers.delete(environment.window);
-      });
-
-      windowEyeDroppers.set(environment.window, eyeDropper);
-    }
-
-    eyeDropper.show(environment.document.documentElement, {copyOnSelect: true});
-  }
-}, {
-  item: "command",
-  runAt: "server",
-  name: "eyedropper_server_hide",
-  hidden: true,
-  exec: function(args, {environment}) {
-    const eyeDropper = windowEyeDroppers.get(environment.window);
-    if (eyeDropper) {
-      eyeDropper.hide();
-    }
-  }
-}];
diff --git a/devtools/client/inspector/moz.build b/devtools/client/inspector/moz.build
index 1e969a756475..6295860601fc 100644
--- a/devtools/client/inspector/moz.build
+++ b/devtools/client/inspector/moz.build
@@ -20,7 +20,6 @@ DIRS += [
 
 DevToolsModules(
     'breadcrumbs.js',
-    'inspector-commands.js',
     'inspector-search.js',
     'inspector.js',
     'panel.js',
diff --git a/devtools/client/responsive.html/commands.js b/devtools/client/responsive.html/commands.js
deleted file mode 100644
index 0702051b358b..000000000000
--- a/devtools/client/responsive.html/commands.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const Services = require("Services");
-
-loader.lazyRequireGetter(this, "ResponsiveUIManager", "devtools/client/responsive.html/manager", true);
-
-const BRAND_SHORT_NAME = Services.strings.createBundle("chrome://branding/locale/brand.properties")
-                                 .GetStringFromName("brandShortName");
-
-const osString = Services.appinfo.OS;
-const l10n = require("gcli/l10n");
-
-exports.items = [
-  {
-    name: "resize",
-    description: l10n.lookup("resizeModeDesc")
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "resize on",
-    description: l10n.lookup("resizeModeOnDesc"),
-    manual: l10n.lookupFormat("resizeModeManual2", [BRAND_SHORT_NAME]),
-    exec: resize
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "resize off",
-    description: l10n.lookup("resizeModeOffDesc"),
-    manual: l10n.lookupFormat("resizeModeManual2", [BRAND_SHORT_NAME]),
-    exec: resize
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "resize toggle",
-    buttonId: "command-button-responsive",
-    buttonClass: "command-button",
-    tooltipText: l10n.lookupFormat(
-      "resizeModeToggleTooltip2",
-      [(osString == "Darwin" ? "Cmd+Opt+M" : "Ctrl+Shift+M")]
-    ),
-    description: l10n.lookup("resizeModeToggleDesc"),
-    manual: l10n.lookupFormat("resizeModeManual2", [BRAND_SHORT_NAME]),
-    state: {
-      isChecked: function(target) {
-        if (!target.tab) {
-          return false;
-        }
-        return ResponsiveUIManager.isActiveForTab(target.tab);
-      },
-      onChange: function(target, changeHandler) {
-        if (target.tab) {
-          ResponsiveUIManager.on("on", changeHandler);
-          ResponsiveUIManager.on("off", changeHandler);
-        }
-      },
-      offChange: function(target, changeHandler) {
-        // Do not check for target.tab as it may already be null during destroy
-        ResponsiveUIManager.off("on", changeHandler);
-        ResponsiveUIManager.off("off", changeHandler);
-      },
-    },
-    exec: resize
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "resize to",
-    description: l10n.lookup("resizeModeToDesc"),
-    params: [
-      {
-        name: "width",
-        type: "number",
-        description: l10n.lookup("resizePageArgWidthDesc"),
-      },
-      {
-        name: "height",
-        type: "number",
-        description: l10n.lookup("resizePageArgHeightDesc"),
-      },
-    ],
-    exec: resize
-  }
-];
-
-async function resize(args, context) {
-  const browserWindow = context.environment.chromeWindow;
-  await ResponsiveUIManager.handleGcliCommand(browserWindow,
-                                              browserWindow.gBrowser.selectedTab,
-                                              this.name,
-                                              args);
-}
diff --git a/devtools/client/responsive.html/moz.build b/devtools/client/responsive.html/moz.build
index 0878f0801812..076277dd96f2 100644
--- a/devtools/client/responsive.html/moz.build
+++ b/devtools/client/responsive.html/moz.build
@@ -14,7 +14,6 @@ DIRS += [
 ]
 
 DevToolsModules(
-    'commands.js',
     'constants.js',
     'index.css',
     'index.js',
diff --git a/devtools/client/scratchpad/moz.build b/devtools/client/scratchpad/moz.build
index 7b06d42927ae..60afca9c1838 100644
--- a/devtools/client/scratchpad/moz.build
+++ b/devtools/client/scratchpad/moz.build
@@ -6,7 +6,6 @@
 
 DevToolsModules(
     'panel.js',
-    'scratchpad-commands.js',
     'scratchpad-manager.jsm',
     'scratchpad.js',
 )
diff --git a/devtools/client/scratchpad/scratchpad-commands.js b/devtools/client/scratchpad/scratchpad-commands.js
deleted file mode 100644
index c31dc42a05e3..000000000000
--- a/devtools/client/scratchpad/scratchpad-commands.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const l10n = require("gcli/l10n");
-
-exports.items = [{
-  item: "command",
-  runAt: "client",
-  name: "scratchpad",
-  buttonId: "command-button-scratchpad",
-  buttonClass: "command-button",
-  tooltipText: l10n.lookup("scratchpadOpenTooltip"),
-  hidden: true,
-  exec: function(args, context) {
-    const {ScratchpadManager} = require("resource://devtools/client/scratchpad/scratchpad-manager.jsm");
-    ScratchpadManager.openScratchpad();
-  }
-}];
diff --git a/devtools/client/styleeditor/moz.build b/devtools/client/styleeditor/moz.build
index a28eb0e2d15d..ac314a710fae 100644
--- a/devtools/client/styleeditor/moz.build
+++ b/devtools/client/styleeditor/moz.build
@@ -9,7 +9,6 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 DevToolsModules(
     'original-source.js',
     'panel.js',
-    'styleeditor-commands.js',
     'StyleEditorUI.jsm',
     'StyleEditorUtil.jsm',
     'StyleSheetEditor.jsm',
diff --git a/devtools/client/styleeditor/styleeditor-commands.js b/devtools/client/styleeditor/styleeditor-commands.js
deleted file mode 100644
index fba3f23ee2ac..000000000000
--- a/devtools/client/styleeditor/styleeditor-commands.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* globals gDevTools */
-
-"use strict";
-
-const l10n = require("gcli/l10n");
-loader.lazyRequireGetter(this, "gDevTools",
-                         "devtools/client/framework/devtools", true);
-
-/**
- * The `edit` command opens the toolbox to the style editor, with a given
- * stylesheet open.
- *
- * This command is tricky. The 'edit' command uses the toolbox, so it's
- * clearly runAt:client, but it uses the 'resource' type which accesses the
- * DOM, so it must also be runAt:server.
- *
- * Our solution is to have the command technically be runAt:server, but to not
- * actually do anything other than basically `return args;`, and have the
- * converter (all converters are runAt:client) do the actual work of opening
- * a toolbox.
- *
- * For alternative solutions that we considered, see the comment on commit
- * 2645af7.
- */
-exports.items = [{
-  item: "command",
-  runAt: "server",
-  name: "edit",
-  description: l10n.lookup("editDesc"),
-  manual: l10n.lookup("editManual2"),
-  params: [
-    {
-      name: "resource",
-      type: {
-        name: "resource",
-        include: "text/css"
-      },
-      description: l10n.lookup("editResourceDesc")
-    },
-    {
-      name: "line",
-      defaultValue: 1,
-      type: {
-        name: "number",
-        min: 1,
-        step: 10
-      },
-      description: l10n.lookup("editLineToJumpToDesc")
-    }
-  ],
-  returnType: "editArgs",
-  exec: args => {
-    return { href: args.resource.name, line: args.line };
-  }
-}, {
-  item: "converter",
-  from: "editArgs",
-  to: "dom",
-  exec: function(args, context) {
-    const target = context.environment.target;
-    const toolboxOpened = gDevTools.showToolbox(target, "styleeditor");
-    return toolboxOpened.then(function(toolbox) {
-      const styleEditor = toolbox.getCurrentPanel();
-      styleEditor.selectStyleSheet(args.href, args.line);
-      return null;
-    });
-  }
-}];
diff --git a/devtools/client/webconsole/console-commands.js b/devtools/client/webconsole/console-commands.js
deleted file mode 100644
index 37f9771ba924..000000000000
--- a/devtools/client/webconsole/console-commands.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft= javascript ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-const l10n = require("gcli/l10n");
-loader.lazyRequireGetter(this, "gDevTools",
-                         "devtools/client/framework/devtools", true);
-
-exports.items = [
-  {
-    item: "command",
-    runAt: "client",
-    name: "splitconsole",
-    hidden: true,
-    buttonId: "command-button-splitconsole",
-    buttonClass: "command-button",
-    tooltipText: l10n.lookupFormat("splitconsoleTooltip2", ["Esc"]),
-    isRemoteSafe: true,
-    state: {
-      isChecked: function(target) {
-        const toolbox = gDevTools.getToolbox(target);
-        return !!(toolbox && toolbox.splitConsole);
-      },
-      onChange: function(target, changeHandler) {
-        // Register handlers for when a change event should be fired
-        // (which resets the checked state of the button).
-        const toolbox = gDevTools.getToolbox(target);
-        if (!toolbox) {
-          return;
-        }
-
-        const callback = changeHandler.bind(null, { target });
-        toolbox.on("split-console", callback);
-        toolbox.once("destroyed", () => {
-          toolbox.off("split-console", callback);
-        });
-      }
-    },
-    exec: function(args, context) {
-      const target = context.environment.target;
-      const toolbox = gDevTools.getToolbox(target);
-
-      if (!toolbox) {
-        return gDevTools.showToolbox(target, "inspector").then((newToolbox) => {
-          newToolbox.toggleSplitConsole();
-        });
-      }
-      return toolbox.toggleSplitConsole();
-    }
-  },
-  {
-    name: "console",
-    description: l10n.lookup("consoleDesc"),
-    manual: l10n.lookup("consoleManual")
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "console clear",
-    description: l10n.lookup("consoleclearDesc"),
-    exec: function(args, context) {
-      const toolbox = gDevTools.getToolbox(context.environment.target);
-      if (toolbox == null) {
-        return null;
-      }
-
-      const panel = toolbox.getPanel("webconsole");
-      if (panel == null) {
-        return null;
-      }
-
-      const onceMessagesCleared = panel.hud.once("messages-cleared");
-      panel.hud.ui.clearOutput();
-      return onceMessagesCleared;
-    }
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "console close",
-    description: l10n.lookup("consolecloseDesc"),
-    exec: function(args, context) {
-      // Don't return a value to GCLI
-      return gDevTools.closeToolbox(context.environment.target).then(() => {});
-    }
-  },
-  {
-    item: "command",
-    runAt: "client",
-    name: "console open",
-    description: l10n.lookup("consoleopenDesc"),
-    exec: function(args, context) {
-      const target = context.environment.target;
-      // Don't return a value to GCLI
-      return gDevTools.showToolbox(target, "webconsole").then(() => {});
-    }
-  }
-];
diff --git a/devtools/client/webconsole/moz.build b/devtools/client/webconsole/moz.build
index c8d99de4ff0c..77ab52862ac9 100644
--- a/devtools/client/webconsole/moz.build
+++ b/devtools/client/webconsole/moz.build
@@ -16,7 +16,6 @@ DIRS += [
 ]
 DevToolsModules(
     'browser-console.js',
-    'console-commands.js',
     'constants.js',
     'hudservice.js',
     'main.js',