diff --git a/Controllers/LEDStripController/RGBController_LEDStrip.cpp b/Controllers/LEDStripController/RGBController_LEDStrip.cpp
index 573ac65e..e3301ba2 100644
--- a/Controllers/LEDStripController/RGBController_LEDStrip.cpp
+++ b/Controllers/LEDStripController/RGBController_LEDStrip.cpp
@@ -89,11 +89,6 @@ void RGBController_LEDStrip::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_LEDStrip::SetCustomMode()
-{
-
-}
-
 void RGBController_LEDStrip::DeviceUpdateMode()
 {
 
diff --git a/Controllers/LEDStripController/RGBController_LEDStrip.h b/Controllers/LEDStripController/RGBController_LEDStrip.h
index 7757b4c5..31bebfba 100644
--- a/Controllers/LEDStripController/RGBController_LEDStrip.h
+++ b/Controllers/LEDStripController/RGBController_LEDStrip.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LIFXController/RGBController_LIFX.cpp b/Controllers/LIFXController/RGBController_LIFX.cpp
index 4501f8dd..99dbe4cf 100644
--- a/Controllers/LIFXController/RGBController_LIFX.cpp
+++ b/Controllers/LIFXController/RGBController_LIFX.cpp
@@ -91,11 +91,6 @@ void RGBController_LIFX::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LIFX::SetCustomMode()
-{
-
-}
-
 void RGBController_LIFX::DeviceUpdateMode()
 {
 
diff --git a/Controllers/LIFXController/RGBController_LIFX.h b/Controllers/LIFXController/RGBController_LIFX.h
index 2402a7ce..7c73da6f 100644
--- a/Controllers/LIFXController/RGBController_LIFX.h
+++ b/Controllers/LIFXController/RGBController_LIFX.h
@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LenovoControllers/RGBController_LenovoUSB.cpp b/Controllers/LenovoControllers/RGBController_LenovoUSB.cpp
index 79bc4b5e..6ef79f87 100644
--- a/Controllers/LenovoControllers/RGBController_LenovoUSB.cpp
+++ b/Controllers/LenovoControllers/RGBController_LenovoUSB.cpp
@@ -303,14 +303,6 @@ void RGBController_LenovoUSB::DeviceUpdateLEDs()
     }
 }
 
-void RGBController_LenovoUSB::SetCustomMode()
-{
-    /*---------------------------------------------------------*\
-    | This device has only one mode                             |
-    \*---------------------------------------------------------*/
-    active_mode = 0;
-}
-
 void RGBController_LenovoUSB::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LenovoControllers/RGBController_LenovoUSB.h b/Controllers/LenovoControllers/RGBController_LenovoUSB.h
index 357d012f..20c12e61 100644
--- a/Controllers/LenovoControllers/RGBController_LenovoUSB.h
+++ b/Controllers/LenovoControllers/RGBController_LenovoUSB.h
@@ -20,7 +20,7 @@
 
 class RGBController_LenovoUSB : public RGBController
 {
-    public:
+public:
     RGBController_LenovoUSB(LenovoUSBController* controller_ptr);
     ~RGBController_LenovoUSB();
 
@@ -31,14 +31,13 @@ class RGBController_LenovoUSB : public RGBController
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
 
-    private:
-    unsigned int lenovo_size_of_leds;
-    LenovoUSBController *controller;
-    const lenovo_led *lenovo_leds;
+private:
+    unsigned int            lenovo_size_of_leds;
+    LenovoUSBController*    controller;
+    const lenovo_led*       lenovo_leds;
 };
 
 #endif
diff --git a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
index 97300fc3..efe198dc 100644
--- a/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
+++ b/Controllers/LexipMouseController/RGBController_LexipMouse.cpp
@@ -90,11 +90,6 @@ void RGBController_LexipMouse::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_LexipMouse::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LexipMouse::DeviceUpdateMode()
 {
     UpdateZoneLEDs(0);
diff --git a/Controllers/LexipMouseController/RGBController_LexipMouse.h b/Controllers/LexipMouseController/RGBController_LexipMouse.h
index d3e13ab8..34d9aa82 100644
--- a/Controllers/LexipMouseController/RGBController_LexipMouse.h
+++ b/Controllers/LexipMouseController/RGBController_LexipMouse.h
@@ -20,11 +20,12 @@ public:
 
     void SetupZones();
     void ResizeZone(int zone, int new_size);
+
     void DeviceUpdateLEDs();
     void UpdateZoneLEDs(int zone);
     void UpdateSingleLED(int led);
+
     void DeviceUpdateMode();
-    void SetCustomMode();
 
 private:
     LexipMouseController* controller;
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub.cpp b/Controllers/LianLiController/RGBController_LianLiUniHub.cpp
index 509afc13..2c7c232a 100644
--- a/Controllers/LianLiController/RGBController_LianLiUniHub.cpp
+++ b/Controllers/LianLiController/RGBController_LianLiUniHub.cpp
@@ -396,14 +396,6 @@ void RGBController_LianLiUniHub::DeviceUpdateMode()
     controller->Synchronize();
 }
 
-void RGBController_LianLiUniHub::SetCustomMode()
-{
-    /*-------------------------------------------------*\
-    | Set mode to Static Color                          |
-    \*-------------------------------------------------*/
-    active_mode = 0;
-}
-
 uint8_t RGBController_LianLiUniHub::convertAnyFanCount(uint8_t count)
 {
     switch (count)
diff --git a/Controllers/LianLiController/RGBController_LianLiUniHub.h b/Controllers/LianLiController/RGBController_LianLiUniHub.h
index 2ff7a070..faa65a00 100644
--- a/Controllers/LianLiController/RGBController_LianLiUniHub.h
+++ b/Controllers/LianLiController/RGBController_LianLiUniHub.h
@@ -21,7 +21,6 @@ public:
     RGBController_LianLiUniHub(LianLiUniHubController* controller_ptr);
 
     void SetupZones();
-
     void ResizeZone(int zone, int new_size);
 
     void DeviceUpdateLEDs();
@@ -30,8 +29,6 @@ public:
 
     void DeviceUpdateMode();
 
-    void SetCustomMode();
-
 private:
     uint8_t convertAnyFanCount(uint8_t count);
     uint8_t convertLedSpeed(uint8_t speed);
diff --git a/Controllers/LianLiController/RGBController_StrimerLConnect.cpp b/Controllers/LianLiController/RGBController_StrimerLConnect.cpp
index 529713bc..e822ea6c 100644
--- a/Controllers/LianLiController/RGBController_StrimerLConnect.cpp
+++ b/Controllers/LianLiController/RGBController_StrimerLConnect.cpp
@@ -259,18 +259,6 @@ void RGBController_StrimerLConnect::UpdateSingleLED(int led)
     controller->SendApply();
 }
 
-void RGBController_StrimerLConnect::SetCustomMode()
-{
-    for(std::size_t mode_idx = 0; mode_idx < modes.size() ; mode_idx++)
-    {
-        if (modes[mode_idx].value == STRIMERLCONNECT_MODE_DIRECT)
-        {
-            active_mode = mode_idx;
-            break;
-        }
-    }
-}
-
 void RGBController_StrimerLConnect::DeviceUpdateMode()
 {
     if(TimeToSend())
diff --git a/Controllers/LianLiController/RGBController_StrimerLConnect.h b/Controllers/LianLiController/RGBController_StrimerLConnect.h
index 68154406..81c44c12 100644
--- a/Controllers/LianLiController/RGBController_StrimerLConnect.h
+++ b/Controllers/LianLiController/RGBController_StrimerLConnect.h
@@ -26,7 +26,6 @@ public:
     void                UpdateZoneLEDs(int zone);
     void                UpdateSingleLED(int led);
 
-    void                SetCustomMode();
     void                DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp b/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp
index 9ba23cd6..85dd7ef6 100644
--- a/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp
+++ b/Controllers/LinuxLEDController/RGBController_LinuxLED.cpp
@@ -91,11 +91,6 @@ void RGBController_LinuxLED::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LinuxLED::SetCustomMode()
-{
-
-}
-
 void RGBController_LinuxLED::DeviceUpdateMode()
 {
 
diff --git a/Controllers/LinuxLEDController/RGBController_LinuxLED.h b/Controllers/LinuxLEDController/RGBController_LinuxLED.h
index 54813bca..b021167f 100644
--- a/Controllers/LinuxLEDController/RGBController_LinuxLED.h
+++ b/Controllers/LinuxLEDController/RGBController_LinuxLED.h
@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.cpp b/Controllers/LogitechController/RGBController_LogitechG203L.cpp
index 844f24c6..dd0fec6d 100644
--- a/Controllers/LogitechController/RGBController_LogitechG203L.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG203L.cpp
@@ -146,11 +146,6 @@ void RGBController_LogitechG203L::UpdateSingleLED(int led)
     controller->SetSingleLED(leds[led].value, red, grn, blu); //dirty workaround for color lag
 }
 
-void RGBController_LogitechG203L::SetCustomMode()
-{
-
-}
-
 void RGBController_LogitechG203L::DeviceUpdateMode()
 {
     unsigned char red = 0;
diff --git a/Controllers/LogitechController/RGBController_LogitechG203L.h b/Controllers/LogitechController/RGBController_LogitechG203L.h
index 5ff17d0d..654f6fde 100644
--- a/Controllers/LogitechController/RGBController_LogitechG203L.h
+++ b/Controllers/LogitechController/RGBController_LogitechG203L.h
@@ -16,7 +16,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG213.cpp b/Controllers/LogitechController/RGBController_LogitechG213.cpp
index ebd659ed..e8628a5c 100644
--- a/Controllers/LogitechController/RGBController_LogitechG213.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG213.cpp
@@ -158,11 +158,6 @@ void RGBController_LogitechG213::UpdateSingleLED(int led)
     controller->SetDirect(leds[led].value, RGBGetRValue(colors[led]), RGBGetGValue(colors[led]), RGBGetBValue(colors[led]));
 }
 
-void RGBController_LogitechG213::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechG213::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechG213.h b/Controllers/LogitechController/RGBController_LogitechG213.h
index e1bf6178..ab09e7a9 100644
--- a/Controllers/LogitechController/RGBController_LogitechG213.h
+++ b/Controllers/LogitechController/RGBController_LogitechG213.h
@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG560.cpp b/Controllers/LogitechController/RGBController_LogitechG560.cpp
index e928d94d..d690c09f 100644
--- a/Controllers/LogitechController/RGBController_LogitechG560.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG560.cpp
@@ -141,11 +141,6 @@ void RGBController_LogitechG560::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LogitechG560::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_LogitechG560::DeviceUpdateMode()
 {
     for(std::size_t led_idx = 0; led_idx < leds.size(); led_idx++)
diff --git a/Controllers/LogitechController/RGBController_LogitechG560.h b/Controllers/LogitechController/RGBController_LogitechG560.h
index 2fd49e8f..54f3e726 100644
--- a/Controllers/LogitechController/RGBController_LogitechG560.h
+++ b/Controllers/LogitechController/RGBController_LogitechG560.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG810.cpp b/Controllers/LogitechController/RGBController_LogitechG810.cpp
index a99e877e..761584fe 100644
--- a/Controllers/LogitechController/RGBController_LogitechG810.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG810.cpp
@@ -373,11 +373,6 @@ void RGBController_LogitechG810::UpdateSingleLED(int led)
     controller->Commit();
 }
 
-void RGBController_LogitechG810::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechG810::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechG810.h b/Controllers/LogitechController/RGBController_LogitechG810.h
index ef21961e..3228cb21 100644
--- a/Controllers/LogitechController/RGBController_LogitechG810.h
+++ b/Controllers/LogitechController/RGBController_LogitechG810.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG815.cpp b/Controllers/LogitechController/RGBController_LogitechG815.cpp
index c4e44a2a..76ef80d0 100644
--- a/Controllers/LogitechController/RGBController_LogitechG815.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG815.cpp
@@ -498,11 +498,6 @@ void RGBController_LogitechG815::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LogitechG815::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechG815::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechG815.h b/Controllers/LogitechController/RGBController_LogitechG815.h
index 492e19d3..30e08bd5 100644
--- a/Controllers/LogitechController/RGBController_LogitechG815.h
+++ b/Controllers/LogitechController/RGBController_LogitechG815.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG910.cpp b/Controllers/LogitechController/RGBController_LogitechG910.cpp
index 969c8efb..cb82fdf5 100644
--- a/Controllers/LogitechController/RGBController_LogitechG910.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG910.cpp
@@ -374,11 +374,6 @@ void RGBController_LogitechG910::UpdateSingleLED(int led)
     controller->Commit();
 }
 
-void RGBController_LogitechG910::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechG910::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechG910.h b/Controllers/LogitechController/RGBController_LogitechG910.h
index b36b79c4..c9f463a0 100644
--- a/Controllers/LogitechController/RGBController_LogitechG910.h
+++ b/Controllers/LogitechController/RGBController_LogitechG910.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG915.cpp b/Controllers/LogitechController/RGBController_LogitechG915.cpp
index a5dbf624..2177ae3d 100644
--- a/Controllers/LogitechController/RGBController_LogitechG915.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG915.cpp
@@ -563,11 +563,6 @@ void RGBController_LogitechG915::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LogitechG915::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechG915::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechG915.h b/Controllers/LogitechController/RGBController_LogitechG915.h
index a4856785..fa74ce92 100644
--- a/Controllers/LogitechController/RGBController_LogitechG915.h
+++ b/Controllers/LogitechController/RGBController_LogitechG915.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechG933.cpp b/Controllers/LogitechController/RGBController_LogitechG933.cpp
index 075c0513..b2777106 100644
--- a/Controllers/LogitechController/RGBController_LogitechG933.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechG933.cpp
@@ -111,11 +111,6 @@ void RGBController_LogitechG933::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LogitechG933::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_LogitechG933::DeviceUpdateMode()
 {
     for(std::size_t led_idx = 0; led_idx < leds.size(); led_idx++)
diff --git a/Controllers/LogitechController/RGBController_LogitechG933.h b/Controllers/LogitechController/RGBController_LogitechG933.h
index 27127b85..6a36e1a9 100644
--- a/Controllers/LogitechController/RGBController_LogitechG933.h
+++ b/Controllers/LogitechController/RGBController_LogitechG933.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp b/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp
index cb39a414..b771a407 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechGLightsync.cpp
@@ -149,11 +149,6 @@ void RGBController_LogitechGLightsync::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_LogitechGLightsync::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_LogitechGLightsync::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync.h b/Controllers/LogitechController/RGBController_LogitechGLightsync.h
index fc77bdb0..00a48865 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync.h
+++ b/Controllers/LogitechController/RGBController_LogitechGLightsync.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp
index 9e23bb0d..2cd1b8f9 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.cpp
@@ -135,11 +135,6 @@ void RGBController_LogitechGLightsync1zone::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_LogitechGLightsync1zone::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_LogitechGLightsync1zone::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h
index a9c3f1d8..786dcccb 100644
--- a/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h
+++ b/Controllers/LogitechController/RGBController_LogitechGLightsync1zone.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp
index e9eb7185..50a1a6a9 100644
--- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.cpp
@@ -129,11 +129,6 @@ void RGBController_LogitechGPowerPlay::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_LogitechGPowerPlay::SetCustomMode()
-{
-    active_mode = 1;
-}
-
 void RGBController_LogitechGPowerPlay::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h
index 17f542be..a7ea95fa 100644
--- a/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h
+++ b/Controllers/LogitechController/RGBController_LogitechGPowerPlay.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp
index 5a12169c..65308064 100644
--- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.cpp
@@ -350,11 +350,6 @@ void RGBController_LogitechGProKeyboard::UpdateSingleLED(int led)
     controller->Commit();
 }
 
-void RGBController_LogitechGProKeyboard::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechGProKeyboard::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h
index 7237e7b3..5b2cdd74 100644
--- a/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h
+++ b/Controllers/LogitechController/RGBController_LogitechGProKeyboard.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
index 444bf8c3..db34afe5 100644
--- a/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.cpp
@@ -208,14 +208,6 @@ void RGBController_LogitechLightspeed::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_LogitechLightspeed::SetCustomMode()
-{
-    if(controller->lightspeed->connected())
-    {
-        active_mode = 1;
-    }
-}
-
 void RGBController_LogitechLightspeed::DeviceUpdateMode()
 {
     /*---------------------------------------------------------*\
diff --git a/Controllers/LogitechController/RGBController_LogitechLightspeed.h b/Controllers/LogitechController/RGBController_LogitechLightspeed.h
index ecdd40b7..0b3e325b 100644
--- a/Controllers/LogitechController/RGBController_LogitechLightspeed.h
+++ b/Controllers/LogitechController/RGBController_LogitechLightspeed.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     uint16_t    pid;        //This is a workaround fix for G502 mode breathing / spectrum cycle swap
diff --git a/Controllers/LogitechController/RGBController_LogitechX56.cpp b/Controllers/LogitechController/RGBController_LogitechX56.cpp
index cc2035c1..dd995aad 100644
--- a/Controllers/LogitechController/RGBController_LogitechX56.cpp
+++ b/Controllers/LogitechController/RGBController_LogitechX56.cpp
@@ -97,11 +97,6 @@ void RGBController_LogitechX56::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_LogitechX56::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_LogitechX56::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/LogitechController/RGBController_LogitechX56.h b/Controllers/LogitechController/RGBController_LogitechX56.h
index 7cf29a5c..efc673f4 100644
--- a/Controllers/LogitechController/RGBController_LogitechX56.h
+++ b/Controllers/LogitechController/RGBController_LogitechX56.h
@@ -26,9 +26,8 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        DeviceSaveMode();
-    void        SetCustomMode();
     void        DeviceUpdateMode();
+    void        DeviceSaveMode();
 
 private:
     LogitechX56Controller*      controller;