diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm
index bcbf753cc..0d4897724 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/Tab.pm
@@ -1233,7 +1233,7 @@ sub build {
         serial_port serial_speed
         octoprint_host octoprint_apikey
         use_firmware_retraction
-        use_volumetric_e set_and_wait_temperatures variable_layer_height
+        use_volumetric_e variable_layer_height
         single_extruder_multi_material start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode
         nozzle_diameter extruder_offset
         retract_length retract_lift retract_speed deretract_speed retract_before_wipe retract_restart_extra retract_before_travel retract_layer_change wipe
@@ -1440,7 +1440,6 @@ sub build {
             $optgroup->append_single_option_line('use_firmware_retraction');
             $optgroup->append_single_option_line('use_volumetric_e');
             $optgroup->append_single_option_line('variable_layer_height');
-            $optgroup->append_single_option_line('set_and_wait_temperatures');
         }
     }
     {
diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp
index 047f23017..3ab717a6f 100644
--- a/xs/src/libslic3r/Model.hpp
+++ b/xs/src/libslic3r/Model.hpp
@@ -14,6 +14,7 @@
 
 namespace Slic3r {
 
+class Model;
 class ModelInstance;
 class ModelMaterial;
 class ModelObject;
@@ -38,7 +39,7 @@ public:
     // Dynamic configuration storage for the object specific configuration values, overriding the global configuration.
     DynamicPrintConfig config;
 
-    Model* get_model() const { return m_model; };
+    Model* get_model() const { return m_model; }
     void apply(const t_model_material_attributes &attributes)
         { this->attributes.insert(attributes.begin(), attributes.end()); }
 
diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp
index b08e62066..a7153c181 100644
--- a/xs/src/libslic3r/Print.cpp
+++ b/xs/src/libslic3r/Print.cpp
@@ -148,7 +148,6 @@ bool Print::invalidate_state_by_config_options(const std::vector<t_config_option
         steps_ignore.insert("use_firmware_retraction");
         steps_ignore.insert("use_relative_e_distances");
         steps_ignore.insert("use_volumetric_e");
-        steps_ignore.insert("set_and_wait_temperatures");
         steps_ignore.insert("variable_layer_height");
         steps_ignore.insert("wipe");
     }
diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp
index 887046274..10123bf64 100644
--- a/xs/src/libslic3r/PrintConfig.cpp
+++ b/xs/src/libslic3r/PrintConfig.cpp
@@ -1537,12 +1537,6 @@ PrintConfigDef::PrintConfigDef()
     def->cli = "use-volumetric-e!";
     def->default_value = new ConfigOptionBool(false);
 
-    def = this->add("set_and_wait_temperatures", coBool);
-    def->label = "Use Set and Wait for changing bed temperatures";
-    def->tooltip = "Check this to change gcode for temperature changes from not waiting (usually M140) to waiting (usually M190). Only necessary if you have a slow-to-heat bed and the first layer bed temp is lower than the other layers.";
-    def->cli = "set-and-wait-temperatures!";
-    def->default_value = new ConfigOptionBool(false);
-
     def = this->add("variable_layer_height", coBool);
     def->label = "Enable variable layer height feature";
     def->tooltip = "Some printers or printer setups may have difficulties printing with a variable layer height. Enabled by default.";
diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp
index d1e6308cf..9876befa8 100644
--- a/xs/src/libslic3r/PrintConfig.hpp
+++ b/xs/src/libslic3r/PrintConfig.hpp
@@ -359,7 +359,6 @@ public:
     ConfigOptionBool                use_firmware_retraction;
     ConfigOptionBool                use_relative_e_distances;
     ConfigOptionBool                use_volumetric_e;
-    ConfigOptionBool                set_and_wait_temperatures;
     ConfigOptionBool                variable_layer_height;
     
     GCodeConfig(bool initialize = true) : StaticPrintConfig() {
@@ -404,7 +403,6 @@ public:
         OPT_PTR(use_firmware_retraction);
         OPT_PTR(use_relative_e_distances);
         OPT_PTR(use_volumetric_e);
-        OPT_PTR(set_and_wait_temperatures);
         OPT_PTR(variable_layer_height);
         return NULL;
     };