diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 1740ee7a72a..17bd39bff75 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -213,8 +213,9 @@ This module provides the core of the Odoo Web Client.
             ('include', 'web._assets_bootstrap'),
 
             'web/static/src/env.js',
-            'web/static/src/core/utils/transitions.scss', # included early because used by other files
+            'web/static/src/core/utils/transitions.scss',  # included early because used by other files
             'web/static/src/core/**/*',
+            ('remove', 'web/static/src/core/commands/**/*'),
             'web/static/src/public/error_notifications.js',
 
             'web/static/src/legacy/scss/base_frontend.scss',
diff --git a/addons/web/static/src/core/debug/debug_menu.js b/addons/web/static/src/core/debug/debug_menu.js
index acb5e729b88..12ad50e6e6f 100644
--- a/addons/web/static/src/core/debug/debug_menu.js
+++ b/addons/web/static/src/core/debug/debug_menu.js
@@ -1,18 +1,14 @@
 /** @odoo-module **/
 
+import { DebugMenuBasic } from "@web/core/debug/debug_menu_basic";
 import { useCommand } from "@web/core/commands/command_hook";
 import { useService } from "@web/core/utils/hooks";
 import { useEnvDebugContext } from "./debug_context";
 
-const { Component } = owl;
-
-export class DebugMenu extends Component {
+export class DebugMenu extends DebugMenuBasic {
     setup() {
+        super.setup();
         const debugContext = useEnvDebugContext();
-        // Needs to be bound to this for use in template
-        this.getElements = async () => {
-            this.elements = await debugContext.getItems(this.env);
-        };
         this.command = useService("command");
         useCommand(
             this.env._t("Debug tools..."),
@@ -57,4 +53,3 @@ export class DebugMenu extends Component {
         );
     }
 }
-DebugMenu.template = "web.DebugMenu";
diff --git a/addons/web/static/src/core/debug/debug_menu_basic.js b/addons/web/static/src/core/debug/debug_menu_basic.js
new file mode 100644
index 00000000000..b81a6f3bdce
--- /dev/null
+++ b/addons/web/static/src/core/debug/debug_menu_basic.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+
+import { useEnvDebugContext } from "./debug_context";
+
+const { Component } = owl;
+
+export class DebugMenuBasic extends Component {
+    setup() {
+        const debugContext = useEnvDebugContext();
+        // Needs to be bound to this for use in template
+        this.getElements = async () => {
+            this.elements = await debugContext.getItems(this.env);
+        };
+    }
+}
+DebugMenuBasic.template = "web.DebugMenu";
diff --git a/addons/website/static/src/js/menu/debug_menu.js b/addons/website/static/src/js/menu/debug_menu.js
index ec84d4683a0..9529ef1aa92 100644
--- a/addons/website/static/src/js/menu/debug_menu.js
+++ b/addons/website/static/src/js/menu/debug_menu.js
@@ -1,16 +1,16 @@
 /** @odoo-module */
 import { registry } from "@web/core/registry";
-import { DebugMenu } from "@web/core/debug/debug_menu";
+import { DebugMenuBasic } from "@web/core/debug/debug_menu_basic";
 import { createDebugContext } from "@web/core/debug/debug_context";
 
 const debugMenuService = {
-    dependencies: ["command", "localization", "orm"],
+    dependencies: ["localization", "orm"],
     start(env) {
         if (env.debug) {
             const systray = document.querySelector('.o_menu_systray');
             if (systray) {
                 Object.assign(env, createDebugContext(env, {categories: ["default"]}));
-                owl.mount(DebugMenu, {
+                owl.mount(DebugMenuBasic, {
                     target: systray,
                     position: 'first-child',
                     env,