diff --git a/src/add-ons/kernel/bus_managers/pci/pci.cpp b/src/add-ons/kernel/bus_managers/pci/pci.cpp
index 73447cc639..081b2fb097 100644
--- a/src/add-ons/kernel/bus_managers/pci/pci.cpp
+++ b/src/add-ons/kernel/bus_managers/pci/pci.cpp
@@ -504,6 +504,9 @@ pci_uninit(void)
 	remove_debugger_command("inb", &display_io);
 	remove_debugger_command("in8", &display_io);
 
+	remove_debugger_command("pcistatus", &pcistatus);
+	remove_debugger_command("pcirefresh", &pcirefresh);
+
 	delete gPCI;
 }
 
diff --git a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
index 162c121f26..1bf5ed3299 100644
--- a/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
+++ b/src/add-ons/kernel/bus_managers/ps2/ps2_service.cpp
@@ -194,5 +194,9 @@ ps2_service_exit(void)
 	wait_for_thread(sServiceThread, NULL);
 	delete_sem(sServiceSem);
 	delete_packet_buffer(sServiceCmdBuffer);
+
+#ifdef DEBUG_PUBLISHING
+	remove_debugger_command("ps2republish", &ps2_republish);
+#endif
 	TRACE("ps2: ps2_service_exit done\n");
 }