diff --git a/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp b/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp
index 5a5f8e0cf..289803327 100644
--- a/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp
+++ b/Controllers/HPOmen30LController/RGBController_HPOmen30L.cpp
@@ -198,11 +198,6 @@ void RGBController_HPOmen30L::UpdateSingleLED(int led)
     UpdateZoneLEDs(led);
 }
 
-void RGBController_HPOmen30L::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HPOmen30L::DeviceUpdateMode()
 {
     for(unsigned int i = 0; i < zones.size(); i++)
diff --git a/Controllers/HPOmen30LController/RGBController_HPOmen30L.h b/Controllers/HPOmen30LController/RGBController_HPOmen30L.h
index 089116140..744934036 100644
--- a/Controllers/HPOmen30LController/RGBController_HPOmen30L.h
+++ b/Controllers/HPOmen30LController/RGBController_HPOmen30L.h
@@ -23,7 +23,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/HoltekController/RGBController_HoltekA070.cpp b/Controllers/HoltekController/RGBController_HoltekA070.cpp
index a6c47569f..a083d3cb6 100644
--- a/Controllers/HoltekController/RGBController_HoltekA070.cpp
+++ b/Controllers/HoltekController/RGBController_HoltekA070.cpp
@@ -98,11 +98,6 @@ void RGBController_HoltekA070::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HoltekA070::SetCustomMode()
-{
-
-}
-
 void RGBController_HoltekA070::DeviceUpdateMode()
 {
     controller->SendMode(modes[active_mode].speed);
diff --git a/Controllers/HoltekController/RGBController_HoltekA070.h b/Controllers/HoltekController/RGBController_HoltekA070.h
index 31678e5ca..45c071199 100644
--- a/Controllers/HoltekController/RGBController_HoltekA070.h
+++ b/Controllers/HoltekController/RGBController_HoltekA070.h
@@ -23,7 +23,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp
index 30f97f874..ef96fd513 100644
--- a/Controllers/HoltekController/RGBController_HoltekA1FA.cpp
+++ b/Controllers/HoltekController/RGBController_HoltekA1FA.cpp
@@ -130,11 +130,6 @@ void RGBController_HoltekA1FA::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HoltekA1FA::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HoltekA1FA::DeviceUpdateMode()
 {
     if((active_mode < HOLTEK_A1FA_MODE_NEON) && (previous_mode < HOLTEK_A1FA_MODE_NEON))
diff --git a/Controllers/HoltekController/RGBController_HoltekA1FA.h b/Controllers/HoltekController/RGBController_HoltekA1FA.h
index e832771d4..b79ab80e5 100644
--- a/Controllers/HoltekController/RGBController_HoltekA1FA.h
+++ b/Controllers/HoltekController/RGBController_HoltekA1FA.h
@@ -25,7 +25,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp
index 3061ff21c..a8843adf6 100644
--- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp
+++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.cpp
@@ -253,11 +253,6 @@ void RGBController_HyperXDRAM::UpdateSingleLED(int led)
     controller->SendApply();
 }
 
-void RGBController_HyperXDRAM::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXDRAM::DeviceUpdateMode()
 {
     bool random = (modes[active_mode].color_mode == MODE_COLORS_RANDOM);
diff --git a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h
index fedd5e467..855e66790 100644
--- a/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h
+++ b/Controllers/HyperXDRAMController/RGBController_HyperXDRAM.h
@@ -26,7 +26,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
 private:
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp
index aa2fb9809..4da9f97bd 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.cpp
@@ -340,11 +340,6 @@ void RGBController_HyperXAlloyElite::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXAlloyElite::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXAlloyElite::DeviceUpdateMode()
 {
     if(modes[active_mode].color_mode == MODE_COLORS_MODE_SPECIFIC)
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h
index 2e38d616b..89831b4e0 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite.h
@@ -29,7 +29,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThreadFunction();
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp
index d37e2eb9a..3d06f44db 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.cpp
@@ -323,11 +323,6 @@ void RGBController_HyperXAlloyElite2::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXAlloyElite2::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXAlloyElite2::DeviceUpdateMode()
 {
 
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h
index 9a7b794c0..e637db954 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyElite2.h
@@ -29,7 +29,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThreadFunction();
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp
index 35ce979cb..2030c7aa9 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.cpp
@@ -277,11 +277,6 @@ void RGBController_HyperXAlloyFPS::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXAlloyFPS::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXAlloyFPS::DeviceUpdateMode()
 {
 
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h
index 36f6daa2c..fa2d5c860 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyFPS.h
@@ -29,7 +29,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThreadFunction();
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp
index c562ed430..d87ed146b 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.cpp
@@ -293,11 +293,6 @@ void RGBController_HyperXAlloyOrigins::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXAlloyOrigins::SetCustomMode()
-{
-
-}
-
 void RGBController_HyperXAlloyOrigins::DeviceUpdateMode()
 {
 
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h
index 28b7a3558..ca51fe81a 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOrigins.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     
     void        KeepaliveThread();
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp
index 014268dc0..f14b16948 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.cpp
@@ -269,11 +269,6 @@ void RGBController_HyperXAlloyOriginsCore::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXAlloyOriginsCore::SetCustomMode()
-{
-
-}
-
 void RGBController_HyperXAlloyOriginsCore::DeviceUpdateMode()
 {
 
diff --git a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h
index 2713021bd..5479c1f19 100644
--- a/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h
+++ b/Controllers/HyperXKeyboardController/RGBController_HyperXAlloyOriginsCore.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     
     void        KeepaliveThread();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp
index 3884dafc0..5d965cba4 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.cpp
@@ -149,11 +149,6 @@ void RGBController_HyperXPulsefireDart::UpdateSingleLED(int led)
     }
 }
 
-void RGBController_HyperXPulsefireDart::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXPulsefireDart::DeviceUpdateMode()
 {
     if(modes[active_mode].color_mode == MODE_COLORS_PER_LED)
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h
index 95be54c34..503f063bd 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireDart.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
     void        DeviceSaveMode();
     
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp
index f0c29d658..787f2122f 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.cpp
@@ -124,11 +124,6 @@ void RGBController_HyperXPulsefireFPSPro::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXPulsefireFPSPro::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXPulsefireFPSPro::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h
index fc5eae1c9..4ef9e6e18 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireFPSPro.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThread();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp
index 51ec89e61..d77b0e50c 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.cpp
@@ -124,11 +124,6 @@ void RGBController_HyperXPulsefireHaste::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXPulsefireHaste::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXPulsefireHaste::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h
index a70c25c0e..84c395d69 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireHaste.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThread();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp
index 32a1dee55..ff77e772a 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.cpp
@@ -107,11 +107,6 @@ void RGBController_HyperXPulsefireRaid::UpdateSingleLED(int /*led*/)
     controller->SendColors(colors);
 }
 
-void RGBController_HyperXPulsefireRaid::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXPulsefireRaid::DeviceUpdateMode()
 {
 
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h
index ae70c7397..b14c39bc4 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireRaid.h
@@ -21,10 +21,11 @@ public:
 
     void SetupZones();
     void ResizeZone(int zone, int new_size);
+    
     void DeviceUpdateLEDs();
     void UpdateZoneLEDs(int zone);
     void UpdateSingleLED(int led);
-    void SetCustomMode();
+
     void DeviceUpdateMode();
     void DeviceSaveMode();
     
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp
index c548cf929..c6c3a7ac5 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.cpp
@@ -133,11 +133,6 @@ void RGBController_HyperXPulsefireSurge::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXPulsefireSurge::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXPulsefireSurge::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h
index 8a6320b10..3f0e8f3f2 100644
--- a/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h
+++ b/Controllers/HyperXMouseController/RGBController_HyperXPulsefireSurge.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThread();
diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp
index 8c327cadf..d2a44a763 100644
--- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp
+++ b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.cpp
@@ -132,11 +132,6 @@ void RGBController_HyperXMousemat::UpdateSingleLED(int /*led*/)
     DeviceUpdateLEDs();
 }
 
-void RGBController_HyperXMousemat::SetCustomMode()
-{
-    active_mode = 0;
-}
-
 void RGBController_HyperXMousemat::DeviceUpdateMode()
 {
     DeviceUpdateLEDs();
diff --git a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.h b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.h
index f12cfb006..64550a1b2 100644
--- a/Controllers/HyperXMousematController/RGBController_HyperXMousemat.h
+++ b/Controllers/HyperXMousematController/RGBController_HyperXMousemat.h
@@ -27,7 +27,6 @@ public:
     void        UpdateZoneLEDs(int zone);
     void        UpdateSingleLED(int led);
 
-    void        SetCustomMode();
     void        DeviceUpdateMode();
 
     void        KeepaliveThread();