diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index a07183fd4..a13a80000 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -2271,41 +2271,6 @@ int MachineObject::command_get_flow_ratio_calibration_result(float nozzle_diamet
     return -1;
 }
 
-int MachineObject::command_unload_filament()
-{
-    if (get_printer_series() == PrinterSeries::SERIES_X1 && !ams_support_virtual_tray) {
-        // fixed gcode file
-        json j;
-        j["print"]["command"] = "gcode_file";
-        j["print"]["param"] = "/usr/etc/print/filament_unload.gcode";
-        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
-        return this->publish_json(j.dump());
-    }
-    else if (get_printer_series() == PrinterSeries::SERIES_P1P || (get_printer_series() == PrinterSeries::SERIES_X1 && ams_support_virtual_tray) ) {
-        std::string gcode = DeviceManager::load_gcode(printer_type, "ams_unload.gcode");
-        if (gcode.empty()) {
-            return -1;
-        }
-
-        json j;
-        j["print"]["command"] = "gcode_line";
-        j["print"]["param"] = gcode;
-        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
-
-        if (m_agent)
-            j["print"]["user_id"] = m_agent->get_user_id();
-
-        return this->publish_json(j.dump());
-    }
-    else {
-        json j;
-        j["print"]["command"] = "unload_filament";
-        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
-        return this->publish_json(j.dump());
-    }
-}
-
-
 int MachineObject::command_ipcam_record(bool on_off)
 {
     BOOST_LOG_TRIVIAL(info) << "command_ipcam_record = " << on_off;
diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp
index e50d8776e..2db045886 100644
--- a/src/slic3r/GUI/DeviceManager.hpp
+++ b/src/slic3r/GUI/DeviceManager.hpp
@@ -878,8 +878,6 @@ public:
     int command_start_flow_ratio_calibration(const X1CCalibInfos& calib_data);
     int command_get_flow_ratio_calibration_result(float nozzle_diameter);
 
-    int command_unload_filament();
-
     // camera control
     int command_ipcam_record(bool on_off);
     int command_ipcam_timelapse(bool on_off);
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index f58edd266..d719ceb9f 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -3145,7 +3145,7 @@ void StatusPanel::on_axis_ctrl_e_down_10(wxCommandEvent &event)
 
 void StatusPanel::on_start_unload(wxCommandEvent &event)
 {
-    if (obj) obj->command_unload_filament();
+    if (obj) obj->command_ams_switch(255);
 }
 
 void StatusPanel::on_set_bed_temp()