diff --git a/keyboards/crkbd/keymaps/colemad/config.h b/keyboards/crkbd/keymaps/colemad/config.h
index f23a3a4177..d8b6861567 100644
--- a/keyboards/crkbd/keymaps/colemad/config.h
+++ b/keyboards/crkbd/keymaps/colemad/config.h
@@ -4,23 +4,8 @@
 
 #define SPLIT_USB_DETECT // Added for Elite-C to work
 
-#define QUICK_TAP_TERM 0
-#define TAPPING_TERM 200
-
-#ifdef RGB_MATRIX_ENABLE
-    #define RGB_MATRIX_KEYPRESSES
-    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-    #define RGB_MATRIX_LED_FLUSH_LIMIT 16
-    #define RGB_MATRIX_HUE_STEP 8
-    #define RGB_MATRIX_SAT_STEP 8
-    #define RGB_MATRIX_VAL_STEP 5
-    #define RGB_MATRIX_SPD_STEP 10
-    
-    // Effects
-    #define ENABLE_RGB_MATRIX_BREATHING
-#endif 
+//#define QUICK_TAP_TERM 0
+//#define TAPPING_TERM 100
 
 #ifdef OLED_ENABLE
     #define SPLIT_LAYER_STATE_ENABLE
diff --git a/keyboards/crkbd/keymaps/colemad/rules.mk b/keyboards/crkbd/keymaps/colemad/rules.mk
index 70eb5c3318..804d695e03 100644
--- a/keyboards/crkbd/keymaps/colemad/rules.mk
+++ b/keyboards/crkbd/keymaps/colemad/rules.mk
@@ -1,20 +1,11 @@
-RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_ENABLE = no
 RGBLIGHT_ENABLE = no
 SPLIT_KEYBOARD = yes
-TAP_DANCE_ENABLE = yes
+TAP_DANCE_ENABLE = no
 MOUSEKEY_ENABLE = no
 OLED_ENABLE = yes
 
-
 # Link Time Optimization (Reduces compiled size)
 LTO_ENABLE = yes
 
-SRC += ./process_records.c
-
-ifeq ($(TAP_DANCE_ENABLE),yes)
-	SRC += ./tap_dances.c
-endif
-
-ifeq ($(OLED_ENABLE),yes)
-	SRC += ./oled.c
-endif
+SRC += ./process_records.c ./oled.c
diff --git a/keyboards/crkbd/keymaps/colemad/tap_dances.c b/keyboards/crkbd/keymaps/colemad/tap_dances.c
deleted file mode 100644
index c0d83b94d0..0000000000
--- a/keyboards/crkbd/keymaps/colemad/tap_dances.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "tap_dances.h"
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_LSFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS)
-};
diff --git a/keyboards/crkbd/keymaps/colemad/tap_dances.h b/keyboards/crkbd/keymaps/colemad/tap_dances.h
deleted file mode 100644
index 1d7cf1e7f4..0000000000
--- a/keyboards/crkbd/keymaps/colemad/tap_dances.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2022 Álvaro Cortés (@ACortesDev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-enum custom_tapdances{
-    TD_LSFT_CAPS = 0,
-};
-
-#define T_SFT TD(TD_LSFT_CAPS) /* Tap for Shift, double tap for CAPSLOCK */