diff --git a/keyboards/keychron/q4/ansi/keymaps/sajenim/combos.def b/keyboards/keychron/q4/ansi/keymaps/sajenim/combos.def
deleted file mode 100644
index 066df36..0000000
--- a/keyboards/keychron/q4/ansi/keymaps/sajenim/combos.def
+++ /dev/null
@@ -1,6 +0,0 @@
-// clang-format off
-
-// name      result  1st chord key 2nd chord key
-COMB(JK_ESC, KC_ESC, KC_J,         KC_K)
-
-/* vim: set filetype=c: */
diff --git a/keyboards/keychron/q4/ansi/keymaps/sajenim/keymap.c b/keyboards/keychron/q4/ansi/keymaps/sajenim/keymap.c
index 8edc06a..fe53187 100644
--- a/keyboards/keychron/q4/ansi/keymaps/sajenim/keymap.c
+++ b/keyboards/keychron/q4/ansi/keymaps/sajenim/keymap.c
@@ -20,11 +20,8 @@ enum layers {
   _BASE,
   _FN1,
   _FN2,
-  _EXT,
 };
 
-#include "g/keymap_combo.h" // layer names must be defined before engine include
-
 /* One Shot Keys:
  * https://github.com/qmk/qmk_firmware/blob/master/docs/one_shot_keys.md */
 
@@ -37,51 +34,29 @@ enum layers {
 #define OS_RALT OSM(MOD_RALT)
 #define OS_RGUI OSM(MOD_RGUI)
 
-/* Shortcuts:
- * Some useful shortcuts such as copy paste */
-
-#define CK_UNDO LCTL(KC_Z)       // Undo
-#define CK_CUT  LCTL(KC_X)       // Cut
-#define CK_COPY LCTL(KC_C)       // Copy
-#define CK_PSTE LCTL(KC_V)       // Paste
-#define DELWORD LCTL(KC_BSPC)    // Delete word
-#define WZ_CMOD LCTL(LSFT(KC_X)) // Wezterm activate copy mode.
-#define WZ_PSTE LCTL(LSFT(KC_V)) // Wezterm paste from clipboard
-
-/* Extend:
- * https://colemakmods.github.io/ergonomic-mods/extend.html */
-#define EXTEND MO(_EXT)
-
 // clang-format off
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_ansi_61(
     QK_GESC, KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,
     KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-    EXTEND,  KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,            KC_ENT,
-    KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,            KC_RSFT,
-    KC_LCTL, KC_LGUI,  KC_LALT,                            KC_SPC,                             KC_RALT,  MO(_FN1), MO(_FN2), KC_RCTL),
+    CW_TOGG, KC_A,     KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,            KC_ENT,
+    OS_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,            OS_RSFT,
+    OS_LCTL, OS_LGUI,  OS_LALT,                            KC_SPC,                             OS_RALT,  MO(_FN1), MO(_FN2), OS_RCTL),
 
   [_FN1] = LAYOUT_ansi_61(
-    KC_GRV,  KC_BRID,  KC_BRIU, KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  RGB_MOD,
-    RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_APP,  KC_SCRL, KC_INS,   KC_PGUP,  KC_HOME,  _______,
-    _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, KC_UP,   KC_PSCR, KC_PGDN,  KC_END,             _______,
-    _______,           _______, _______, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL,             _______,
+    _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,
+    _______, KC_HOME,  KC_UP,   KC_END,  KC_PGUP, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,
+    _______, KC_LEFT,  KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______,  _______,            _______,
+    _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,            _______,
     _______, _______,  _______,                            _______,                            _______,  _______,  _______,  _______),
 
   [_FN2] = LAYOUT_ansi_61(
-    KC_TILD, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,
+    QK_BOOT, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,
     RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,  _______,  _______,
     _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______,  _______,            _______,
     _______,           _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,            _______,
     _______, _______,  _______,                            _______,                            _______,  _______,  _______,  _______),
-
-  [_EXT] = LAYOUT_ansi_61(
-    QK_BOOT, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   DELWORD,
-    _______, KC_MPLY,  KC_MSTP, KC_MPRV, KC_MNXT, KC_VOLU, WZ_CMOD, KC_HOME, KC_UP,   KC_END,  KC_PGUP,  KC_DEL,   _______,  _______,
-    _______, OS_LGUI,  OS_LALT, OS_LSFT, OS_LCTL, KC_VOLD, WZ_PSTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  KC_BSPC,            _______,
-    _______,           CK_UNDO, CK_CUT,  CK_COPY, CK_PSTE, KC_0,    KC_1,    KC_2,    KC_3,    KC_4,     KC_ENT,             _______,
-    _______, _______,  _______,                            _______,                            _______,  _______,  _______,  _______)
 };
 
 // clang-format on
diff --git a/keyboards/keychron/q4/ansi/keymaps/sajenim/rules.mk b/keyboards/keychron/q4/ansi/keymaps/sajenim/rules.mk
index 902d4c1..643b645 100644
--- a/keyboards/keychron/q4/ansi/keymaps/sajenim/rules.mk
+++ b/keyboards/keychron/q4/ansi/keymaps/sajenim/rules.mk
@@ -1,7 +1,3 @@
 # Software features
-COMBO_ENABLE = yes
+CAPS_WORD_ENABLE = true
 
-# Combo dictionary
-ifeq ($(COMBO_ENABLE),yes)
-	VPATH += keyboards/gboards
-endif