diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 353b46eaa..5f19d39c0 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -1412,22 +1412,39 @@ int MachineObject::command_axis_control(std::string axis, double unit, double va
 
 int MachineObject::command_start_calibration()
 {
-    // fixed gcode file
-    json j;
-    j["print"]["command"] = "gcode_file";
-    j["print"]["param"] = "/usr/etc/print/auto_cali_for_user.gcode";
-    j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
-    return this->publish_json(j.dump());
+    if (printer_type == "BL-P001"
+        || printer_type == "BL-P002") {
+        // fixed gcode file
+        json j;
+        j["print"]["command"] = "gcode_file";
+        j["print"]["param"] = "/usr/etc/print/auto_cali_for_user.gcode";
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j.dump());
+    } else {
+        json j;
+        j["print"]["command"] = "calibration";
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j.dump());
+    }
 }
 
 int MachineObject::command_unload_filament()
 {
-    // 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());
+    if (printer_type == "BL-P001"
+        || printer_type == "BL-P002") {
+        // 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 {
+        json j;
+        j["print"]["command"] = "unload_filament";
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j.dump());
+    }
 }
 
 
diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp
index c3c37af09..ee12eea6b 100644
--- a/src/slic3r/GUI/Monitor.cpp
+++ b/src/slic3r/GUI/Monitor.cpp
@@ -210,12 +210,6 @@ MonitorPanel::~MonitorPanel()
     m_hms_panel = new HMSPanel(m_tabpanel);
     m_tabpanel->AddPage(m_hms_panel, _L("HMS"),"", false);
 
-
-#if !BBL_RELEASE_TO_PUBLIC
-    m_debug_panel = new DebugPanel(m_tabpanel);
-    m_tabpanel->AddPage(m_debug_panel, _L("Debug"), "", false);
-#endif
-
     m_initialized = true;
     show_status((int)MonitorStatus::MONITOR_NO_PRINTER);
 }
@@ -436,12 +430,6 @@ void MonitorPanel::update_all()
     if (m_upgrade_panel->IsShown()) {
         m_upgrade_panel->update(obj);
     }
-
-#if !BBL_RELEASE_TO_PUBLIC
-    if (m_debug_panel->IsShown()) {
-        m_debug_panel->update(obj);
-    }
-#endif
 }
 
 bool MonitorPanel::Show(bool show)