diff --git a/src/kaleidoscope/driver/hid/RCMComposite.cpp b/src/kaleidoscope/driver/hid/RCMComposite.cpp
index 02bf46c8..2d1b2271 100644
--- a/src/kaleidoscope/driver/hid/RCMComposite.cpp
+++ b/src/kaleidoscope/driver/hid/RCMComposite.cpp
@@ -23,8 +23,7 @@ namespace hid {
 namespace rcmcomposite {
 
 USBHID RCMHID;
-HIDKeyboard RCMBootKeyboard(RCMHID, 0);
-HIDKeyboard RCMKeyboard(RCMHID);
+HIDKeyboard RCMBootKeyboard(RCMHID, 1);
 HIDConsumer RCMConsumer(RCMHID);
 HIDMouse RCMMouse(RCMHID);
 USBCompositeSerial CompositeSerial;
diff --git a/src/kaleidoscope/driver/hid/RCMComposite.h b/src/kaleidoscope/driver/hid/RCMComposite.h
index 20eaaa7b..8ce637d2 100644
--- a/src/kaleidoscope/driver/hid/RCMComposite.h
+++ b/src/kaleidoscope/driver/hid/RCMComposite.h
@@ -30,16 +30,14 @@ namespace driver {
 namespace hid {
 
 namespace rcmcomposite {
+
 extern USBHID RCMHID;
-extern HIDKeyboard RCMBootKeyboard;
-extern HIDConsumer RCMConsumer;
 extern USBCompositeSerial CompositeSerial;
 
 const uint8_t report_description_[] = {
   HID_BOOT_KEYBOARD_REPORT_DESCRIPTOR(),
-  HID_KEYBOARD_REPORT_DESCRIPTOR(2),
-  HID_CONSUMER_REPORT_DESCRIPTOR(3),
-  HID_MOUSE_REPORT_DESCRIPTOR(4)
+  HID_CONSUMER_REPORT_DESCRIPTOR(),
+  HID_MOUSE_REPORT_DESCRIPTOR()
 };
 
 }
diff --git a/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h b/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h
index 9d16602c..27f278e6 100644
--- a/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h
+++ b/src/kaleidoscope/driver/hid/rcmcomposite/Keyboard.h
@@ -28,7 +28,6 @@ namespace hid {
 namespace rcmcomposite {
 
 extern HIDKeyboard RCMBootKeyboard;
-extern HIDKeyboard RCMKeyboard;
 extern HIDConsumer RCMConsumer;
 
 class BootKeyboardWrapper {
@@ -81,56 +80,6 @@ class BootKeyboardWrapper {
   }
 };
 
-class SixKROKeyboardWrapper {
- public:
-  SixKROKeyboardWrapper() {}
-
-  void begin() {}
-
-  uint8_t getProtocol() {
-    return 1;
-  }
-  void setProtocol(uint8_t protocol) {}
-  void setDefaultProtocol(uint8_t protocol) {}
-
-  void sendReport() {
-    RCMKeyboard.sendReport();
-  }
-
-  void press(uint8_t code) {
-    RCMKeyboard.press(code);
-  }
-  void release(uint8_t code) {
-    RCMKeyboard.release(code);
-  }
-  void releaseAll() {
-    RCMKeyboard.releaseAll();
-  }
-
-  bool isKeyPressed(uint8_t code) {
-    return RCMKeyboard.isKeyPressed(code);
-  }
-  bool wasKeyPressed(uint8_t code) {
-    return RCMKeyboard.wasKeyPressed(code);
-  }
-  bool isModifierActive(uint8_t code) {
-    return RCMKeyboard.isModifierActive(code);
-  }
-  bool wasModifierActive(uint8_t code) {
-    return RCMKeyboard.wasModifierActive(code);
-  }
-  bool isAnyModifierActive() {
-    return RCMKeyboard.isAnyModifierActive();
-  }
-  bool wasAnyModifierActive() {
-    return RCMKeyboard.wasAnyModifierActive();
-  }
-
-  uint8_t getLeds() {
-    return RCMKeyboard.getLEDs();
-  }
-};
-
 class ConsumerControlWrapper {
  public:
   ConsumerControlWrapper() {}
@@ -155,7 +104,6 @@ class ConsumerControlWrapper {
 
 struct KeyboardProps: public base::KeyboardProps {
   typedef BootKeyboardWrapper BootKeyboard;
-  typedef SixKROKeyboardWrapper NKROKeyboard;
   typedef ConsumerControlWrapper ConsumerControl;
 };