diff --git a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp
index 0799e219..16f22629 100644
--- a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp
+++ b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.cpp
@@ -137,11 +137,6 @@ void RGBController_BlinkyTape::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_BlinkyTape::SetCustomMode()
-{
-
-}
-
 void RGBController_BlinkyTape::DeviceUpdateMode()
 {
 
diff --git a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h
index 92b2329a..06f3da69 100644
--- a/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h
+++ b/Controllers/BlinkyTapeController/RGBController_BlinkyTape.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp
index acb90252..4de29c0e 100644
--- a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp
+++ b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.cpp
@@ -138,11 +138,6 @@ void RGBController_CorsairCommanderCore::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairCommanderCore::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairCommanderCore::DeviceUpdateMode()
 {
     switch(modes[active_mode].value)
diff --git a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h
index b2524af9..ef5c924d 100644
--- a/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h
+++ b/Controllers/CorsairCommanderCoreController/RGBController_CorsairCommanderCore.h
@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp
index df933148..22797268 100644
--- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp
+++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.cpp
@@ -115,11 +115,6 @@ void RGBController_CorsairDominatorPlatinum::UpdateSingleLED(int led)
     controller->ApplyColors();
 }
 
-void RGBController_CorsairDominatorPlatinum::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairDominatorPlatinum::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h
index 3e1c7bd8..2d388598 100644
--- a/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h
+++ b/Controllers/CorsairDominatorPlatinumController/RGBController_CorsairDominatorPlatinum.h
@@ -25,7 +25,6 @@ public:
     void UpdateZoneLEDs(int zone);
     void UpdateSingleLED(int led);
 
-    void SetCustomMode();
     void DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp
index 74c8f79b..b68d0b75 100644
--- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp
+++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.cpp
@@ -126,11 +126,6 @@ void RGBController_CorsairHydro::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairHydro::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairHydro::DeviceUpdateMode()
 {
     switch(modes[active_mode].value)
diff --git a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h
index 5b8e1f3a..3551f30b 100644
--- a/Controllers/CorsairHydroController/RGBController_CorsairHydro.h
+++ b/Controllers/CorsairHydroController/RGBController_CorsairHydro.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp
index 5031ad13..ac9ba815 100644
--- a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp
+++ b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.cpp
@@ -127,11 +127,6 @@ void RGBController_CorsairHydroPlatinum::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairHydroPlatinum::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairHydroPlatinum::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h
index e3eb2d54..664d906f 100644
--- a/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h
+++ b/Controllers/CorsairHydroPlatinumController/RGBController_CorsairHydroPlatinum.h
@@ -24,7 +24,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp
index 1a4a6ee4..bbe9d355 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.cpp
@@ -359,11 +359,6 @@ void RGBController_CorsairK100::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_CorsairK100::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairK100::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.h
index 6a3499b4..7779f461 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK100.h
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK100.h
@@ -24,8 +24,8 @@ public:
     void UpdateSingleLED(int led);
 
     void DeviceUpdateMode();
-    void SetCustomMode();
-    void        KeepaliveThread();
+
+    void KeepaliveThread();
 
 private:
     CorsairK100Controller*                              controller;
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp
index bb7002bd..2c35ab87 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.cpp
@@ -120,11 +120,6 @@ void RGBController_CorsairK55RGBPRO::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_CorsairK55RGBPRO::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairK55RGBPRO::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.h
index 57e5006d..bba8ee44 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.h
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK55RGBPRO.h
@@ -18,8 +18,8 @@ public:
     void UpdateSingleLED(int led);
 
     void DeviceUpdateMode();
-    void SetCustomMode();
-    void        KeepaliveThread();
+
+    void KeepaliveThread();
 
 private:
     CorsairK55RGBPROController*                         controller;
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp
index 63c512ff..af0c9ea6 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.cpp
@@ -238,11 +238,6 @@ void RGBController_CorsairK65Mini::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairK65Mini::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairK65Mini::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h
index 9f17317a..f2d2f887 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK65Mini.h
@@ -17,8 +17,8 @@ public:
     void UpdateSingleLED(int led);
 
     void DeviceUpdateMode();
-    void SetCustomMode();
-    void        KeepaliveThread();
+
+    void KeepaliveThread();
 
 private:
     CorsairK65MiniController*                           controller;
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp
index 4bb45c6f..fb183b39 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.cpp
@@ -351,11 +351,6 @@ void RGBController_CorsairK95PlatinumXT::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairK95PlatinumXT::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairK95PlatinumXT::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h
index e9ef5f51..ce40ff97 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairK95PlatinumXT.h
@@ -17,11 +17,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:
     CorsairK95PlatinumXTController*                              controller;    
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp
index f05e1425..39824662 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.cpp
@@ -1209,11 +1209,6 @@ void RGBController_CorsairPeripheral::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_CorsairPeripheral::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairPeripheral::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h
index ccf0f2a7..b9a0899d 100644
--- a/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h
+++ b/Controllers/CorsairPeripheralController/RGBController_CorsairPeripheral.h
@@ -28,10 +28,8 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
-
 private:
     CorsairPeripheralController* controller;
 };
diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp
index 031dd0bc..a580b49b 100644
--- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp
+++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.cpp
@@ -113,11 +113,6 @@ void RGBController_CorsairVengeance::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CorsairVengeance::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairVengeance::DeviceUpdateMode()
 {
     controller->SetMode(modes[active_mode].value);
diff --git a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h
index 458932cf..ce2209bc 100644
--- a/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h
+++ b/Controllers/CorsairVengeanceController/RGBController_CorsairVengeance.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp
index 6d871f34..5be32c43 100644
--- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp
+++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.cpp
@@ -241,11 +241,6 @@ void RGBController_CorsairVengeancePro::UpdateSingleLED(int led)
     controller->ApplyColors();
 }
 
-void RGBController_CorsairVengeancePro::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairVengeancePro::DeviceUpdateMode()
 {
     unsigned int  corsair_direction = 0;
diff --git a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h
index 21e0dc33..606e0105 100644
--- a/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h
+++ b/Controllers/CorsairVengeanceProController/RGBController_CorsairVengeancePro.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp
index 59afc00d..c9d96d1c 100644
--- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp
+++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.cpp
@@ -319,11 +319,6 @@ void RGBController_CorsairWireless::UpdateSingleLED(int /*led*/)
     controller->SetLEDs(colors);
 }
 
-void RGBController_CorsairWireless::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CorsairWireless::DeviceUpdateMode()
 {
 
diff --git a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h
index 09f3907f..49c1709f 100644
--- a/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h
+++ b/Controllers/CorsairWirelessController/RGBController_CorsairWireless.h
@@ -28,7 +28,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThread();
diff --git a/Controllers/CougarController/RGBController_CougarKeyboard.cpp b/Controllers/CougarController/RGBController_CougarKeyboard.cpp
index bddda10f..9b59c739 100644
--- a/Controllers/CougarController/RGBController_CougarKeyboard.cpp
+++ b/Controllers/CougarController/RGBController_CougarKeyboard.cpp
@@ -447,11 +447,6 @@ void RGBController_CougarKeyboard::UpdateSingleLED(int led)
     controller->SetLedsDirect(colour);
 }
 
-void RGBController_CougarKeyboard::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CougarKeyboard::DeviceUpdateMode()
 {
     mode set_mode                   = modes[active_mode];
diff --git a/Controllers/CougarController/RGBController_CougarKeyboard.h b/Controllers/CougarController/RGBController_CougarKeyboard.h
index c8727760..a546f466 100644
--- a/Controllers/CougarController/RGBController_CougarKeyboard.h
+++ b/Controllers/CougarController/RGBController_CougarKeyboard.h
@@ -25,7 +25,6 @@ public:
     void                UpdateZoneLEDs(int zone);
     void                UpdateSingleLED(int led);
 
-    void                SetCustomMode();
     void                DeviceUpdateMode();
     void                DeviceSaveMode();
 
diff --git a/Controllers/CougarController/RGBController_CougarRevengerST.cpp b/Controllers/CougarController/RGBController_CougarRevengerST.cpp
index 11ed8eab..5ec48c23 100644
--- a/Controllers/CougarController/RGBController_CougarRevengerST.cpp
+++ b/Controllers/CougarController/RGBController_CougarRevengerST.cpp
@@ -162,11 +162,6 @@ void RGBController_CougarRevengerST::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_CougarRevengerST::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CougarRevengerST::DeviceUpdateMode()
 {
     switch(modes[active_mode].value)
diff --git a/Controllers/CougarController/RGBController_CougarRevengerST.h b/Controllers/CougarController/RGBController_CougarRevengerST.h
index 1b3256b7..77897078 100644
--- a/Controllers/CougarController/RGBController_CougarRevengerST.h
+++ b/Controllers/CougarController/RGBController_CougarRevengerST.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:
     CougarRevengerSTController* controller;
diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp
index 518c796b..4b1da93a 100644
--- a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp
+++ b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.cpp
@@ -81,11 +81,6 @@ void RGBController_CreativeSoundBlasterXG6::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_CreativeSoundBlasterXG6::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_CreativeSoundBlasterXG6::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h
index 76c81455..08894a22 100644
--- a/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h
+++ b/Controllers/CreativeController/RGBController_CreativeSoundBlasterXG6.h
@@ -16,7 +16,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/CrucialController/RGBController_Crucial.cpp b/Controllers/CrucialController/RGBController_Crucial.cpp
index 46e4b996..352041b1 100644
--- a/Controllers/CrucialController/RGBController_Crucial.cpp
+++ b/Controllers/CrucialController/RGBController_Crucial.cpp
@@ -192,11 +192,6 @@ void RGBController_Crucial::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_Crucial::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_Crucial::DeviceUpdateMode()
 {
     if(modes[active_mode].value == 0xFFFF)
diff --git a/Controllers/CrucialController/RGBController_Crucial.h b/Controllers/CrucialController/RGBController_Crucial.h
index 7b741d60..8ab523ef 100644
--- a/Controllers/CrucialController/RGBController_Crucial.h
+++ b/Controllers/CrucialController/RGBController_Crucial.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private: