diff --git a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp
index 9cca958d..c0a763ea 100644
--- a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp
+++ b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.cpp
@@ -268,10 +268,9 @@ static const char *normal_led_names[] =
     @comment
 \*-------------------------------------------------------------------*/
 
-RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr, ValkyrieKeyboardMappingLayoutType keyboard_layout)
+RGBController_ValkyrieKeyboard::RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr)
 {
     controller  = controller_ptr;
-    layout      = keyboard_layout;
 
     name        = "Valkyrie Keyboard Device";
     vendor      = "Valkyrie";
@@ -309,6 +308,15 @@ RGBController_ValkyrieKeyboard::~RGBController_ValkyrieKeyboard()
 
 void RGBController_ValkyrieKeyboard::SetupZones()
 {
+    ValkyrieKeyboardMappingLayoutType layout;
+    switch(controller->GetInterfaceNum())
+    {
+        case 3:
+            layout = PRO_LAYOUT;
+        default:
+            layout = NORMAL_LAYOUT;
+    }
+
     /*---------------------------------------------------------*\
     | Set up zones                                              |
     \*---------------------------------------------------------*/
diff --git a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h
index f38c8424..3b374177 100644
--- a/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h
+++ b/Controllers/ValkyrieKeyboardController/RGBController_ValkyrieKeyboard.h
@@ -21,7 +21,7 @@ enum ValkyrieKeyboardMappingLayoutType
 class RGBController_ValkyrieKeyboard : public RGBController
 {
 public:
-    RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr, ValkyrieKeyboardMappingLayoutType keyboard_layout);
+    RGBController_ValkyrieKeyboard(ValkyrieKeyboardController* controller_ptr);
     ~RGBController_ValkyrieKeyboard();
 
     void        SetupZones();
@@ -33,5 +33,4 @@ public:
 
 private:
     ValkyrieKeyboardController*         controller;
-    ValkyrieKeyboardMappingLayoutType   layout;
 };
diff --git a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp
index 661884bd..c4502f04 100644
--- a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp
+++ b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardController.cpp
@@ -57,7 +57,6 @@ int ValkyrieKeyboardController::GetInterfaceNum()
 
 void ValkyrieKeyboardController::SendColors(unsigned char*  color_data,unsigned int color_data_size)
 {
-//    unsigned char*  color_data_ptr = color_data;
     unsigned char usb_buf_pro[392];
     unsigned char usb_buf_normal[408];
     int led_num = 0;
diff --git a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp
index 18846dbd..e2b92221 100644
--- a/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp
+++ b/Controllers/ValkyrieKeyboardController/ValkyrieKeyboardControllerDetect.cpp
@@ -1,19 +1,7 @@
-#include "Detector.h"
-#include "ValkyrieKeyboardController.h"
+#include <hidapi/hidapi.h>
+#include "Detector.h"
 #include "RGBController.h"
 #include "RGBController_ValkyrieKeyboard.h"
-#include <hidapi/hidapi.h>
-
-ValkyrieKeyboardMappingLayoutType GetKeyboardMappingLayoutType(int interface)
-{
-    switch(interface)
-    {
-        case 3:
-            return PRO_LAYOUT;
-        default:
-            return NORMAL_LAYOUT;
-    }
-}
 
 void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string& name)
 {
@@ -21,10 +9,9 @@ void DetectValkyrieKeyboardControllers(hid_device_info* info, const std::string&
 
     if(dev)
     {
-            ValkyrieKeyboardController*       controller     = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number);
-            ValkyrieKeyboardMappingLayoutType layout         = GetKeyboardMappingLayoutType(info->interface_number);
-            RGBController_ValkyrieKeyboard*   rgb_controller = new RGBController_ValkyrieKeyboard(controller, layout);
-            rgb_controller->name                           = name;
+            ValkyrieKeyboardController*       controller        = new ValkyrieKeyboardController(dev, info->path, info->product_id, info->interface_number);
+            RGBController_ValkyrieKeyboard*   rgb_controller    = new RGBController_ValkyrieKeyboard(controller);
+            rgb_controller->name                                = name;
             ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
 }