diff --git a/klippy/extras/heater_bed.py b/klippy/extras/heater_bed.py
index f20c157b..c8f68f2e 100644
--- a/klippy/extras/heater_bed.py
+++ b/klippy/extras/heater_bed.py
@@ -20,8 +20,7 @@ class PrinterHeaterBed:
         gcode = self.printer.lookup_object('gcode')
         temp = gcode.get_float('S', params, 0.)
         toolhead = self.printer.lookup_object('toolhead')
-        print_time = toolhead.get_last_move_time()
-        self.heater.set_temp(print_time, temp)
+        self.heater.set_temp(temp)
         if wait and temp:
             gcode.wait_for_temperature(self.heater)
     def cmd_M190(self, params):
diff --git a/klippy/extras/pid_calibrate.py b/klippy/extras/pid_calibrate.py
index b7201926..689084e9 100644
--- a/klippy/extras/pid_calibrate.py
+++ b/klippy/extras/pid_calibrate.py
@@ -23,11 +23,11 @@ class PIDCalibrate:
             heater = pheater.lookup_heater(heater_name)
         except self.printer.config_error as e:
             raise self.gcode.error(str(e))
-        print_time = self.printer.lookup_object('toolhead').get_last_move_time()
+        self.printer.lookup_object('toolhead').get_last_move_time()
         calibrate = ControlAutoTune(heater, target)
         old_control = heater.set_control(calibrate)
         try:
-            heater.set_temp(print_time, target)
+            heater.set_temp(target)
         except self.printer.command_error as e:
             heater.set_control(old_control)
             raise
diff --git a/klippy/heater.py b/klippy/heater.py
index c16cafaa..706ce718 100644
--- a/klippy/heater.py
+++ b/klippy/heater.py
@@ -97,7 +97,7 @@ class Heater:
         return self.max_power
     def get_smooth_time(self):
         return self.smooth_time
-    def set_temp(self, print_time, degrees):
+    def set_temp(self, degrees):
         if degrees and (degrees < self.min_temp or degrees > self.max_temp):
             raise self.printer.command_error(
                 "Requested temperature (%.1f) out of range (%.1f:%.1f)"
@@ -139,9 +139,8 @@ class Heater:
         return {'temperature': smoothed_temp, 'target': target_temp}
     cmd_SET_HEATER_TEMPERATURE_help = "Sets a heater temperature"
     def cmd_SET_HEATER_TEMPERATURE(self, params):
-        print_time = self.printer.lookup_object('toolhead').get_last_move_time()
         temp = self.gcode.get_float('TARGET', params, 0.)
-        self.set_temp(print_time, temp)
+        self.set_temp(temp)
 
 
 ######################################################################
@@ -277,13 +276,12 @@ class PrinterHeaters:
                 "G-Code sensor id %s already registered" % (gcode_id,))
         self.gcode_id_to_sensor[gcode_id] = psensor
         self.available_sensors.append(config.get_name())
-    def turn_off_all_heaters(self, print_time):
+    def turn_off_all_heaters(self, print_time=0.):
         for heater in self.heaters.values():
-            heater.set_temp(print_time, 0.)
+            heater.set_temp(0.)
     cmd_TURN_OFF_HEATERS_help = "Turn off all heaters"
     def cmd_TURN_OFF_HEATERS(self, params):
-        print_time = self.printer.lookup_object('toolhead').get_last_move_time()
-        self.turn_off_all_heaters(print_time)
+        self.turn_off_all_heaters()
     def get_status(self, eventtime):
         return {'available_heaters': self.available_heaters,
                 'available_sensors': self.available_sensors}
diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py
index 692255d6..b5613c99 100644
--- a/klippy/kinematics/extruder.py
+++ b/klippy/kinematics/extruder.py
@@ -145,7 +145,6 @@ class PrinterExtruder:
                           start_v, cruise_v, accel)
     def cmd_M104(self, params, wait=False):
         # Set Extruder Temperature
-        toolhead = self.printer.lookup_object('toolhead')
         gcode = self.printer.lookup_object('gcode')
         temp = gcode.get_float('S', params, 0.)
         if 'T' in params:
@@ -159,10 +158,9 @@ class PrinterExtruder:
                     return
                 raise gcode.error("Extruder not configured")
         else:
-            extruder = toolhead.get_extruder()
-        print_time = toolhead.get_last_move_time()
+            extruder = self.printer.lookup_object('toolhead').get_extruder()
         heater = extruder.get_heater()
-        heater.set_temp(print_time, temp)
+        heater.set_temp(temp)
         if wait and temp:
             gcode.wait_for_temperature(heater)
     def cmd_M109(self, params):