diff --git a/klippy/gcode.py b/klippy/gcode.py
index 59d401f2..2ef92045 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -47,7 +47,7 @@ class GCodeParser:
         handlers = ['G1', 'G4', 'G20', 'G21', 'G28', 'G90', 'G91', 'G92',
                     'M18', 'M82', 'M83', 'M105', 'M110', 'M112', 'M114', 'M115',
                     'M206', 'M400',
-                    'HELP', 'QUERY_ENDSTOPS', 'CLEAR_SHUTDOWN',
+                    'HELP', 'QUERY_ENDSTOPS',
                     'RESTART', 'FIRMWARE_RESTART', 'STATUS']
         if self.heater_nozzle is not None:
             handlers.extend(['M104', 'M109', 'PID_TUNE'])
@@ -394,14 +394,6 @@ class GCodeParser:
         temp = self.get_float('S', params)
         heater.start_auto_tune(temp)
         self.bg_temp(heater)
-    cmd_CLEAR_SHUTDOWN_when_not_ready = True
-    cmd_CLEAR_SHUTDOWN_help = "Clear a firmware shutdown and restart"
-    def cmd_CLEAR_SHUTDOWN(self, params):
-        if self.toolhead is None:
-            self.cmd_default(params)
-            return
-        self.printer.mcu.clear_shutdown()
-        self.printer.request_exit('restart')
     def prep_restart(self):
         if self.is_printer_ready:
             self.respond_info("Preparing to restart...")
diff --git a/klippy/klippy.py b/klippy/klippy.py
index c73c18c2..a352663f 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -39,9 +39,9 @@ Error configuring printer
 """
 
 message_shutdown = """
-Once the underlying issue is corrected, the "CLEAR_SHUTDOWN"
-command can be used to clear the firmware flag and restart
-the host software.
+Once the underlying issue is corrected, use the
+"FIRMWARE_RESTART" command to reset the firmware, reload the
+config, and restart the host software.
 Printer is shutdown
 """
 
diff --git a/klippy/mcu.py b/klippy/mcu.py
index 00af7e08..efb5f7de 100644
--- a/klippy/mcu.py
+++ b/klippy/mcu.py
@@ -387,7 +387,6 @@ class MCU:
         # Config building
         self._config_error = config.error
         self._emergency_stop_cmd = self._reset_cmd = None
-        self._clear_shutdown_cmd = None
         self._oids = []
         self._config_cmds = []
         self._config_crc = None
@@ -444,7 +443,6 @@ class MCU:
         self._stats_sumsq_base = self.serial.msgparser.get_constant_float(
             'STATS_SUMSQ_BASE')
         self._emergency_stop_cmd = self.lookup_command("emergency_stop")
-        self._clear_shutdown_cmd = self.lookup_command("clear_shutdown")
         try:
             self._reset_cmd = self.lookup_command("reset")
         except self.serial.msgparser.error, e:
@@ -484,9 +482,6 @@ class MCU:
             self._mcu_tick_avg, self._mcu_tick_stddev)
     def force_shutdown(self):
         self.send(self._emergency_stop_cmd.encode())
-    def clear_shutdown(self):
-        logging.info("Sending clear_shutdown command")
-        self.send(self._clear_shutdown_cmd.encode())
     def microcontroller_restart(self):
         reactor = self._printer.reactor
         if self._restart_method == 'rpi_usb':