diff --git a/keyboard/kimera/Makefile b/keyboard/kimera/Makefile
index 238e2455..468dc314 100644
--- a/keyboard/kimera/Makefile
+++ b/keyboard/kimera/Makefile
@@ -144,7 +144,7 @@ BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
 KEYMAP_IN_EEPROM_ENABLE = yes	# External keymap in eeprom
 #KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
-FADING_LED_ENABLE = yes # Enable fading backlight
+#FADING_LED_ENABLE = yes # Enable fading backlight
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 LEDMAP_ENABLE = yes	# Enable LED mapping
 LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
diff --git a/keyboard/kimera/Makefile.pjrc b/keyboard/kimera/Makefile.pjrc
index 5818baca..9c49208f 100644
--- a/keyboard/kimera/Makefile.pjrc
+++ b/keyboard/kimera/Makefile.pjrc
@@ -107,7 +107,7 @@ BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
 KEYMAP_IN_EEPROM_ENABLE = yes	# External keymap in eeprom
 #KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
-FADING_LED_ENABLE = yes # Enable fading backlight
+#FADING_LED_ENABLE = yes # Enable fading backlight
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 LEDMAP_ENABLE = yes	# Enable LED mapping
 LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
diff --git a/keyboard/kimera/Makefile_8M b/keyboard/kimera/Makefile_8M
index fe60c6cc..a40a3100 100644
--- a/keyboard/kimera/Makefile_8M
+++ b/keyboard/kimera/Makefile_8M
@@ -138,7 +138,7 @@ BACKLIGHT_ENABLE = yes	# Enable keyboard backlight functionality
 KEYMAP_IN_EEPROM_ENABLE = yes	# External keymap in eeprom
 #KEYMAP_SECTION_ENABLE = yes	# Fixed address keymap for keymap editor
 SOFTPWM_LED_ENABLE = yes # Enable SoftPWM to drive backlight
-FADING_LED_ENABLE = yes # Enable fading backlight
+#FADING_LED_ENABLE = yes # Enable fading backlight
 BREATHING_LED_ENABLE = yes # Enable breathing backlight
 LEDMAP_ENABLE = yes	# Enable LED mapping
 LEDMAP_IN_EEPROM_ENABLE = yes # Read LED mapping from eeprom
diff --git a/keyboard/kimera/keymap_default.c b/keyboard/kimera/keymap_default.c
index 0764aa54..4045ef45 100644
--- a/keyboard/kimera/keymap_default.c
+++ b/keyboard/kimera/keymap_default.c
@@ -28,28 +28,6 @@ const uint8_t keymaps[][MATRIX_SIZE] PROGMEM = {
         CAPS,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,     ENT,                    P4,  P5,  P6,        \
         LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,          RSFT,       UP,         P1,  P2,  P3,  PENT, \
         LCTL,LGUI,LALT,               SPC,                RALT,RGUI,FN0, RCTL,  LEFT,DOWN,RGHT,  P0,       PDOT       ),
-    /* Keymap 1: Fn Layer
-     * ,---------------------------------------------------------------------------------------.
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |               |
-     * |---------------------------------------------------------------------------------------|
-     * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |   |   |   |   |   |   |   |
-     * |---------------------------------------------------------------------------------------|
-     * |     |Fn1|Fn2|Fn3|   |   |   |   |   |   |   |   |   |     |   |   |   |   |   |   |   |
-     * |-----------------------------------------------------------------------------------|   |
-     * |      |   |   |   |   |   |   |   |   |   |   |   |        |           |   |   |   |   |
-     * |-----------------------------------------------------------|   ,---.   |----------------
-     * |        |   |   |   |   |   |   |   |   |   |   |          |   |   |   |   |   |   |   |
-     * |-----------------------------------------------------------------------------------|   |
-     * |    |    |    |                        |    |    |    |    |   |   |   |   |   |   |   |
-     * `---------------------------------------------------------------------------------------'
-     */
-    KEYMAP_ANSI_104(
-        TRNS,     TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,                       \
-        TRNS,FN1, FN2, FN3, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  NLCK,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,     TRNS,                   TRNS,TRNS,TRNS,      \
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,          TRNS,       TRNS,       TRNS,TRNS,TRNS,TRNS, \
-        TRNS,TRNS,TRNS,               TRNS,               TRNS,TRNS,TRNS,TRNS,  TRNS,TRNS,TRNS,  TRNS,     TRNS       ),
 };
 
 /*
@@ -60,11 +38,6 @@ const uint16_t fn_actions[FN_ACTIONS_COUNT] __attribute__ ((section (".keymap.fn
 #else
 const uint16_t fn_actions[] PROGMEM = {
 #endif
-    /* Poker2 Layout */
-    [0] = ACTION_LAYER_MOMENTARY(1),
-    [1] = ACTION_BACKLIGHT_TOGGLE(),
-    [2] = ACTION_BACKLIGHT_DECREASE(),
-    [3] = ACTION_BACKLIGHT_INCREASE(),
 };
 
 #ifdef KEYMAP_IN_EEPROM_ENABLE
diff --git a/keyboard/kimera/keymap_two_headed.c b/keyboard/kimera/keymap_two_headed.c
index df48664d..f1f55d19 100644
--- a/keyboard/kimera/keymap_two_headed.c
+++ b/keyboard/kimera/keymap_two_headed.c
@@ -39,41 +39,6 @@ const uint8_t keymaps[][MATRIX_SIZE] PROGMEM = {
         NO,  SPC, NO,  RALT,RGUI,FN0, RCTL,NO,  LEFT,DOWN,RGHT,NO,  NO,  NO,  NO,  NO, \
         NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
         NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO  ),
-
-    /* Keymap 1: Fn Layer
-     * ,----------------------------------------.    ,------------------------------------------------.
-     * |               ||   |   |   |   |   |   |    | |   |   |   |   | |   |   |   |   ||Fn2|Fn1|Fn3|
-     * |---------------||-----------------------|    |-----------------------------------||-----------|
-     * |   |   |   |   ||   |   |   |   |   |   |    |   |   |   |   |   |   |   |       ||   |   |   |
-     * |---------------||-------------------------.  `-----------------------------------||-----------|
-     * |   |   |   |   ||     |   |   |   |   |   |    |   |   |   |   |   |   |   |     ||   |   |   |
-     * |-----------|   ||--------------------------.   `---------------------------------||-----------|
-     * |   |   |   |   ||      |   |   |   |   |   |    |   |   |   |   |   |   |        ||           |
-     * |---------------||----------------------------.   `-------------------------------||   ,---.   |
-     * |   |   |   |   ||        |   |   |   |   |   |    |   |   |   |   |   |          ||   |   |   |
-     * |-----------|   ||----------------------------|    |------------------------------||-----------|
-     * |       |   |   ||    |    |    |             |    |          |    |    |    |    ||   |   |   |
-     * `---------------------------------------------'    `-------------------------------------------'
-     */
-    KEYMAP_16x16(
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  FN2, FN1, FN3, NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO, \
-        NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO,  NO  ),
-
 };
 
 /*
@@ -84,11 +49,6 @@ const uint16_t fn_actions[FN_ACTIONS_COUNT] __attribute__ ((section (".keymap.fn
 #else
 const uint16_t fn_actions[] PROGMEM = {
 #endif
-    /* Poker2 Layout */
-    [0] = ACTION_LAYER_MOMENTARY(1),
-    [1] = ACTION_BACKLIGHT_TOGGLE(),
-    [2] = ACTION_BACKLIGHT_DECREASE(),
-    [3] = ACTION_BACKLIGHT_INCREASE(),
 };
 
 #ifdef KEYMAP_IN_EEPROM_ENABLE