[Keymap Removal] keyboard with most keymaps (#23092)

18 files changed, 0 insertions, 1346 deletions

diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/README.md b/keyboards/hhkb/ansi/keymaps/cinaeco/README.md
deleted file mode 100644
index c1c48e6093..0000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# QMK Keyboard Firmware for HHKB
-
-## Modifications
-
-### HHKB Fn Layer
-
-Added some Media keys.
-
-### Utility Layer (SpaceFN)
-
-Hold `Space` for:
-
-- Vi-style direction keys.
-- WASD-style mouse keys.
-- Dynamic macro playback on `1` and `2`.
-- Qwerty/Colemak/Dvorak layout selection on `-`, `=` and `\ `
-
-### Dynamic Macros
-
-Hold `q` and press:
-
-- `1` or `2` to record macro 1 or 2.
-- `s` to stop recording.
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
deleted file mode 100644
index ed660722c2..0000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#undef MANUFACTURER
-#undef PRODUCT
-#define MANUFACTURER    "QMK"
-#define PRODUCT         "HHKB QMK cinaeco"
-
-// Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly.
-#undef TAPPING_TERM
-#define TAPPING_TERM 230
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
deleted file mode 100644
index 5ad8bee641..0000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * cinaeco's HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-// Layers.
-#define QWER 0
-#define COLE 1
-#define DVOR 2
-#define HHKB 3
-#define UTIL 4
-#define MREC 5
-
-// Easier-to-read Layer Arrays.
-#define ____ KC_TRNS
-
-enum hhkb_keycodes
-{
-    DYNAMIC_MACRO_RANGE = SAFE_RANGE,
-};
-
-#include "dynamic_macro.h"
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* QWER Layer: Qwerty Default
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |Q/MREC|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [QWER] = LAYOUT(
-        KC_ESC, 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_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, 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_BSPC,
-        KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, CTL_T(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, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* COLE Layer: Colemak
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |Q/MREC|  W|  F|  P|  G|  J|  L|  U|  Y|  ;|  [|  ]|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  R|  S|  T|  D|  H|  N|  E|  I|  O|  '|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     Z|  X|  C|  V|  K|  B|  M|  ,|  .|  /|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [COLE] = LAYOUT(
-        KC_ESC, 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_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, KC_Q), KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
-        KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, CTL_T(KC_ENT),
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_K, KC_B, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* DVOR Layer: Dvorak
-     *
-     * ,--------------------------------------------------------------.
-     * |Esc|    1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  [|  ]|  \|  `|
-     * |--------------------------------------------------------------|
-     * |Tab  |'/MREC|  ,|  .|  P|  Y|  F|  G|  C|  R|  L|  /|  =|Backs|
-     * |--------------------------------------------------------------|
-     * |Ctrl  |     A|  O|  E|  U|  I|  D|  H|  T|  N|  S|  -|Ent/Ctrl|
-     * |--------------------------------------------------------------|
-     * |Shift   |     ;|  Q|  J|  K|  X|  B|  M|  W|  V|  Z|Shift |Fn0|
-     * `--------------------------------------------------------------'
-     *       |Alt|Gui  |       Space/UTIL      |Gui  |Alt|
-     *       `-------------------------------------------'
-     *
-     */
-
-    [DVOR] = LAYOUT(
-        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
-        KC_TAB, LT(MREC, KC_QUOT), KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,
-        KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, CTL_T(KC_ENT),
-        KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
-
-    /* HHKB Layer: HHKB mode (HHKB Fn)
-     *
-     * ,-----------------------------------------------------------.
-     * |Pwr| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Ins|Del|
-     * |-----------------------------------------------------------|
-     * |Caps |PLA|PRV|NXT|   |   |   |   |Psc|Slk|Pus|Up |   |Backs|
-     * |-----------------------------------------------------------|
-     * |      |VoD|VoU|Mut|Ejc|   |  *|  /|Hom|PgU|Lef|Rig|Enter   |
-     * |-----------------------------------------------------------|
-     * |        |   |   |   |   |   |  +|  -|End|PgD|Dow|      |   |
-     * `-----------------------------------------------------------'
-     *       |   |     |                       |STOP |   |
-     *       `-------------------------------------------'
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, 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_INS, KC_DEL,
-        KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, ____, KC_BSPC,
-        ____, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, ____, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        ____, ____, ____, ____, ____, ____, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ____, ____,
-        ____, ____, ____, KC_MSTP, ____),
-
-    /* UTIL Layer: Extra utilities
-     *
-     * ,-------------------------------------------------------------.
-     * |DFU|PLY1|PLY2|   |   |   |   |   |   |   |   |QWE|COL|DVO|DBG|
-     * |-------------------------------------------------------------|
-     * |     |MLB |M-Up|MRB|MwU|   |Hom|PgD|PgU|End|   |   |   |     |
-     * |-------------------------------------------------------------|
-     * |      |M-Lt|M-Dn|M-R|MwD|   |LEF|DOW|UP |RIG|   |   |        |
-     * |-------------------------------------------------------------|
-     * |        |    |    |   |   |SPC|   |   |   |   |   |      |   |
-     * `-------------------------------------------------------------'
-     *       |   |     |                       |     |   |
-     *       `-------------------------------------------'
-     *
-     */
-
-    [UTIL] = LAYOUT(
-        QK_BOOT, DM_PLY1, DM_PLY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DB_TOGG,
-        ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
-        ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
-        ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____),
-
-    /* MREC Layer: Record macros with `q`
-     *
-     * ,-------------------------------------------------------------.
-     * |   |REC1|REC2|   |   |   |   |   |   |   |   |   |   |   |   |
-     * |-------------------------------------------------------------|
-     * |     |    |    |   |   |   |   |   |   |   |   |   |   |     |
-     * |-------------------------------------------------------------|
-     * |      |    |RSTP|   |   |   |   |   |   |   |   |   |        |
-     * |-------------------------------------------------------------|
-     * |        |    |    |   |   |   |   |   |   |   |   |      |   |
-     * `-------------------------------------------------------------'
-     *       |   |     |                       |     |   |
-     *       `-------------------------------------------'
-     *
-     */
-
-    [MREC] = LAYOUT(
-        ____, DM_REC1, DM_REC2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, DM_RSTP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
-        ____, ____, ____, ____, ____)
-
-};
-
-// For Dynamic Macros.
-bool process_record_user(uint16_t keycode, keyrecord_t *record)
-{
-    if (!process_record_dynamic_macro(keycode, record))
-    {
-        return false;
-    }
-    return true;
-}
diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk b/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
deleted file mode 100644
index 4e4deffa12..0000000000
--- a/keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# cinaeco's HHKB firmware
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
diff --git a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c b/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
deleted file mode 100644
index 25e75c8f99..0000000000
--- a/keyboards/hhkb/ansi/keymaps/lxol/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * lxol HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define WIN 1
-#define HHKB 2
-#define RGUILEV 3
-#define LGUILEV 4
-#define RALTLEV 5
-#define LALTLEV 6
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* Layer 0: Default Layer
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K | L | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [BASE] = LAYOUT( // layer 0 : default
-
-        KC_ESC, 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_BSLS, KC_GRV,
-        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_BSPC,
-        KC_LCTL, LT(LALTLEV, KC_A), LT(LGUILEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RGUILEV, KC_L), LT(RALTLEV, KC_SCLN), KC_QUOT, MT(MOD_RCTL, 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, MO(HHKB),
-        KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT),
-
-    /* Layer 1: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | Ins   | Del |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-
-                      |---+---+---+---+---|
-                      |   |   |   |   |   |
-                      |---+---+---+---+---|
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, 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_INS, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer LGUI: All keys with RGUI modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [RGUILEV] = LAYOUT( // Right GUI layer  by KC_L
-
-        RGUI(KC_ESC), RGUI(KC_1), RGUI(KC_2), RGUI(KC_3), RGUI(KC_4), RGUI(KC_5), RGUI(KC_6), RGUI(KC_7), RGUI(KC_8), RGUI(KC_9), RGUI(KC_0), RGUI(KC_MINS), RGUI(KC_EQL), RGUI(KC_BSLS), RGUI(KC_GRV),
-        RGUI(KC_TAB), RGUI(KC_Q), RGUI(KC_W), RGUI(KC_E), RGUI(KC_R), RGUI(KC_T), RGUI(KC_Y), RGUI(KC_U), RGUI(KC_I), RGUI(KC_O), RGUI(KC_P), RGUI(KC_LBRC), RGUI(KC_RBRC), RGUI(KC_BSPC),
-        RGUI(KC_LCTL), RGUI(KC_A), RGUI(KC_S), RGUI(KC_D), RGUI(KC_F), RGUI(KC_G), RGUI(KC_H), RGUI(KC_J), RGUI(KC_K), KC_TRNS, KC_TRNS, RGUI(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        RGUI(KC_LSFT), RGUI(KC_Z), RGUI(KC_X), RGUI(KC_C), RGUI(KC_V), RGUI(KC_B), RGUI(KC_N), RGUI(KC_M), RGUI(KC_COMM), RGUI(KC_DOT), RGUI(KC_SLSH), RGUI(KC_RSFT), KC_TRNS,
-        KC_LALT, KC_LGUI, RGUI(KC_SPC), KC_RGUI, KC_RALT),
-
-    /* Layer LGUI: All keys with LGUI modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | LGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [LGUILEV] = LAYOUT( // Right GUI layer  by KC_L
-
-        LGUI(KC_ESC), LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), LGUI(KC_MINS), LGUI(KC_EQL), LGUI(KC_BSLS), LGUI(KC_GRV),
-        LGUI(KC_TAB), LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC), LGUI(KC_BSPC),
-        LGUI(KC_LCTL), KC_TRNS, KC_TRNS, LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), LGUI(KC_SCLN), LGUI(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        KC_LSFT, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), KC_RSFT, KC_TRNS,
-        KC_LALT, KC_LGUI, LGUI(KC_SPC), KC_LGUI, KC_RALT),
-
-    /* Layer LALT: All keys with RALT modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | RGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [RALTLEV] = LAYOUT( // Right ALT layer  by KC_L
-
-        RALT(KC_ESC), RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), RALT(KC_MINS), RALT(KC_EQL), RALT(KC_BSLS), RALT(KC_GRV),
-        RALT(KC_TAB), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_LBRC), RALT(KC_RBRC), RALT(KC_BSPC),
-        RALT(KC_LCTL), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), KC_TRNS, KC_TRNS, RALT(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        RALT(KC_LSFT), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_SLSH), RALT(KC_RSFT), KC_TRNS,
-        KC_LALT, KC_LGUI, RALT(KC_SPC), KC_RGUI, KC_RALT),
-
-    /* Layer LALT: All keys with LALT modifier
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0   | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P   | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K |   | ;   | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | Fn2 | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LAlt | LGUI | Space | LGUI | RAlt |
-                 |------+------+-------+------+------|
-    */
-
-    [LALTLEV] = LAYOUT( // Right ALT layer  by KC_L
-
-        LALT(KC_ESC), LALT(KC_1), LALT(KC_2), LALT(KC_3), LALT(KC_4), LALT(KC_5), LALT(KC_6), LALT(KC_7), LALT(KC_8), LALT(KC_9), LALT(KC_0), LALT(KC_MINS), LALT(KC_EQL), LALT(KC_BSLS), LALT(KC_GRV),
-        LALT(KC_TAB), LALT(KC_Q), LALT(KC_W), LALT(KC_E), LALT(KC_R), LALT(KC_T), LALT(KC_Y), LALT(KC_U), LALT(KC_I), LALT(KC_O), LALT(KC_P), LALT(KC_LBRC), LALT(KC_RBRC), LALT(KC_BSPC),
-        LALT(KC_LCTL), KC_TRNS, KC_TRNS, LALT(KC_D), LALT(KC_F), LALT(KC_G), LALT(KC_H), LALT(KC_J), LALT(KC_K), LALT(KC_L), LALT(KC_SCLN), LALT(KC_QUOT), MT(MOD_RCTL, KC_ENT),
-        KC_LSFT, LALT(KC_Z), LALT(KC_X), LALT(KC_C), LALT(KC_V), LALT(KC_B), LALT(KC_N), LALT(KC_M), LALT(KC_COMM), LALT(KC_DOT), LALT(KC_SLSH), KC_RSFT, KC_TRNS,
-        KC_LALT, KC_LGUI, LALT(KC_SPC), KC_LGUI, KC_RALT),
-
-    /* Layer WIN: Win layer
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Esc    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =        | \     | ` |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P | [     | ]        | Backs |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Contro | A | S | D | F | G | H | J | K | L | ; | '     | RCtl/Ent |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-     | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0      |       |   |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
-
-                 |------+------+-------+------+------|
-                 | LGui | LAlt | Space | RGui | Ralt |
-                 |------+------+-------+------+------|
-    */
-
-    [WIN] = LAYOUT( // BASE level with swapped GUI/ALT
-
-        KC_ESC, 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_BSLS, KC_GRV,
-        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_BSPC,
-        KC_LCTL, LT(LGUILEV, KC_A), LT(LALTLEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RALTLEV, KC_L), LT(RGUILEV, KC_SCLN), KC_QUOT, MT(MOD_RCTL, 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, MO(HHKB),
-        KC_RGUI, KC_RALT, KC_SPC, KC_RALT, KC_RGUI)};
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md b/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md
deleted file mode 100644
index 15b87c498d..0000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
- # QMK HHKB Keymap: schaeferdev
-
-This is my QMK keymap for the Happy Hacking Keyboard Pro 2 alternate controller made by Hasu.
-
-
-## Movement Layer
-
-The main difference from the Default layer is the introduction of a Movement layer than can be used by holding the right command button. This layer enables to move the mouse and scroll using Page up and Page down. Additionally it allows to use Arrow-keys in VIM-like fashion on hjkl.
-
-I prefer this movement to the default HHKB FN layer as  it allows all my fingers to remain on the home row.
-
-## Minor Changes
-
-- swapped Y and Z (as I am German and used to the different order).
-- changed position of Delete Key
-- both ` and ~
-
-
-## Setup (for macOS)
-```bash
-brew tap osx-cross/avr
-brew install avr-gcc
-brew install dfu-programmer
-```
-
-
-## Flashing
-
-```bash
-make clean
-make hhkb:schaeferdev:dfu
-```
-
-
-## Troubleshooting
-For some reason I ran into the issue that my CMD key no longer recognized. I am not entirely sure what caused this but the problem occured regardless of the layout I flashed (was also broken for the default hhkb layout). I was able to fix this issue by resetting EEPROM of the keyboard. The easiest way to do this is probably to use the QMK Toolbox.
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h b/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h
deleted file mode 100644
index b3c799bb82..0000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Based off of this section:
-// https://github.com/qmk/qmk_firmware/blob/master/doc/BUILD_GUIDE.md#the-configh-file
-#pragma once
-
-// Define mousekey settings
-#define MOUSEKEY_DELAY 0
-#define MOUSEKEY_INTERVAL 4
-#define MOUSEKEY_MAX_SPEED 1
-#define MOUSEKEY_TIME_TO_MAX 70
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c b/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
deleted file mode 100644
index d1f56e0362..0000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  -*-  eval: (turn-on-orgtbl); -*-
- * default HHKB Layout
- */
-#include QMK_KEYBOARD_H
-
-#define BASE 0
-#define HHKB 1
-#define MOVEMENT 2
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* BASE Level: Default Layer
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | ESC    | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | -     | =   | Backs |Backs|
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | Tab    | Q | W | E | R | T | Y | U | I | O | P | [     | ]   | \     |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     |Ctrl/ESC| A | S | D | F | G | H | J | K | L | ; | '     | Ent |       |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-     | Shift  | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 |       |     |
-     |--------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+-----|
-            |------+------+-----------------------+------+------|
-            | LAlt | LGUI | ******* Space ******* | MOUSE| RAlt |
-            |------+------+-----------------------+------+------|
-    */
-
-    [BASE] = LAYOUT( //  default layer
-        KC_ESC, 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_BSPC,
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-        CTL_T(KC_ESC), 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_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
-        KC_LALT, KC_LCMD, /*          */ KC_SPC, /*       */ MO(MOVEMENT), KC_RALT),
-
-    /* Layer HHKB: HHKB mode (HHKB Fn)
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Pwr  | F1  | F2  | F3  | F4 | F5 | F6 | F7 | F8  | F9  | F10 | F11 | F12   | DEL   | DEL |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      | Caps |     |     |     |    |    |    |    | Psc | Slk | Pus | Up  |       | Backs |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      | VoD | VoU | Mut |    |    | *  | /  | Hom | PgU | Lef | Rig | Enter |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-      |      |     |     |     |    |    | +  | -  | End | PgD | Dow |     |       |       |     |
-      |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [HHKB] = LAYOUT(
-        KC_PWR, 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_DEL, KC_DEL,
-        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
-        KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-    /* Layer MOUSE: MOUSE mode (MOUSE Fn)
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      | `~   |ACC1 |ACC2 |ACC3 |    |    |        |                |              |           |             |     |       | DEL   | DEL |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN2|     | up  |    | PgU|        |                |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN1|right|down |left| PgD|  <-    |  down arrow    |   up arrow   |  ->       |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-      |      |MBTN3|     |     |    |    |        |     ~ (N)      |              |           |             |     |       |       |     |
-      |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
-                 |------+------+----------------------+------+------+
-                 | **** | **** | ******************** | **** | **** |
-                 |------+------+----------------------+------+------+
-     */
-
-    [MOVEMENT] = LAYOUT(
-        KC_GRV, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN2, KC_TRNS, KC_MS_U, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk b/keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk
deleted file mode 100644
index 35591533cc..0000000000
--- a/keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
deleted file mode 100644
index 9c2b6e8ca5..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-#include "command.h"
-#include "action_pseudo.h"
-
-static uint8_t send_key_shift_bit[SHIFT_BIT_SIZE];
-
-/*
- * Action Pseudo Process.
- * Gets the keycode in the same position of the specified layer.
- * The keycode is sent after conversion according to the conversion keymap.
- */
-void action_pseudo_process(keyrecord_t *record, uint8_t base_layer, const uint16_t (*keymap)[2]) {
-    uint8_t  prev_shift;
-    uint16_t keycode;
-    uint16_t pseudo_keycode;
-
-    /* Get keycode from specified layer */
-    keycode = keymap_key_to_keycode(base_layer, record->event.key);
-
-    prev_shift = get_mods() & MOD_MASK_SHIFT;
-
-    if (record->event.pressed) {
-        /* If magic commands entered, keycode is not converted */
-        if (IS_COMMAND()) {
-            if (prev_shift) {
-                add_shift_bit(keycode);
-            }
-            register_code(keycode);
-            return;
-        }
-
-        if (prev_shift) {
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-            add_shift_bit(keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_code(QK_LSFT ^ pseudo_keycode);
-            } else {
-                /* Delete shift mod temporarily */
-                unregister_mods(prev_shift);
-                register_code(pseudo_keycode);
-                register_mods(prev_shift);
-            }
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-            dprintf("pressed: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-            if (IS_LSFT(pseudo_keycode)) {
-                register_weak_mods(MOD_LSFT);
-                register_code(QK_LSFT ^ pseudo_keycode);
-                /* Prevent key repeat to avoid unintended output on Windows */
-                unregister_code(QK_LSFT ^ pseudo_keycode);
-                unregister_weak_mods(MOD_LSFT);
-            } else {
-                register_code(pseudo_keycode);
-            }
-        }
-    } else {
-        if (get_shift_bit(keycode)) {
-            del_shift_bit(keycode);
-            pseudo_keycode = convert_keycode(keymap, keycode, true);
-        } else {
-            pseudo_keycode = convert_keycode(keymap, keycode, false);
-        }
-        dprintf("released: %02X, converted: %04X\n", keycode, pseudo_keycode);
-
-        if (IS_LSFT(pseudo_keycode)) {
-            unregister_code(QK_LSFT ^ pseudo_keycode);
-        } else {
-            unregister_code(pseudo_keycode);
-        }
-    }
-}
-
-/* Convert keycode according to the keymap */
-uint16_t convert_keycode(const uint16_t (*keymap)[2], uint16_t keycode, bool shift_modded) {
-    uint16_t pseudo_keycode = 0x00; /* default value */
-
-    switch (keycode) {
-        case KC_A ... KC_CAPS_LOCK:
-#if defined(__AVR__)
-            if (shift_modded) {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][1]);
-            } else {
-                pseudo_keycode = pgm_read_word(&keymap[keycode][0]);
-            }
-#else
-            if (shift_modded) {
-                pseudo_keycode = keymap[keycode][1];
-            } else {
-                pseudo_keycode = keymap[keycode][0];
-            }
-#endif
-            break;
-    }
-
-    /* If pseudo keycode is the default value, use the keycode as it is */
-    if (pseudo_keycode == 0x00) {
-        if (shift_modded) {
-            pseudo_keycode = S(keycode);
-        } else {
-            pseudo_keycode = keycode;
-        }
-    }
-
-    return pseudo_keycode;
-}
-
-uint8_t get_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        return send_key_shift_bit[keycode >> 3] & (1 << (keycode & 7));
-    } else {
-        dprintf("get_shift_bit: Can't get shift bit. keycode: %02X\n", keycode);
-        return 0;
-    }
-}
-
-void add_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] |= (1 << (keycode & 7));
-    } else {
-        dprintf("add_shift_bit: Can't add shift bit. keycode: %02X\n", keycode);
-    }
-}
-
-void del_shift_bit(uint16_t keycode) {
-    if ((keycode >> 3) < SHIFT_BIT_SIZE) {
-        send_key_shift_bit[keycode >> 3] &= ~(1 << (keycode & 7));
-    } else {
-        dprintf("del_shift_bit: Can't delete shift bit. keycode: %02X\n", keycode);
-    }
-}
diff --git a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h b/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h
deleted file mode 100644
index 7c3d38fa07..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/action_pseudo.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define SHIFT_BIT_SIZE (0xE7 / 8 + 1) /* 1bit per 1key */
-#define IS_LSFT(kc) ((QK_LSFT & (kc)) == QK_LSFT)
-
-void     action_pseudo_process(keyrecord_t *, uint8_t, const uint16_t (*)[2]);
-uint16_t convert_keycode(const uint16_t (*)[2], uint16_t, bool);
-
-uint8_t get_shift_bit(uint16_t);
-void    add_shift_bit(uint16_t);
-void    del_shift_bit(uint16_t);
diff --git a/keyboards/hhkb/ansi/keymaps/shela/config.h b/keyboards/hhkb/ansi/keymaps/shela/config.h
deleted file mode 100644
index db66659165..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/config.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#undef VENDOR_ID
-#define VENDOR_ID 0x0853
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x0100
-#undef DEVICE_VER
-#define DEVICE_VER 0x0102
-#undef MANUFACTURER
-#define MANUFACTURER "Topre Corporation"
-#undef PRODUCT
-#define PRODUCT "HHKB Professional"
-
-#undef TAPPING_TERM
-#define TAPPING_TERM 210
-#define SPFN_TAPPING_TERM 190 /* SpaceFN tapping term */
-
-#define ONESHOT_TAP_TOGGLE 3
-#define ONESHOT_TIMEOUT 2000
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap.c b/keyboards/hhkb/ansi/keymaps/shela/keymap.c
deleted file mode 100644
index 922ec02c41..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "keymap_jis2us.h"
-#include "action_pseudo.h"
-
-// clang-format off
-enum keyboard_layers {
-    _QWERTY = 0,
-    _DVORAK,
-    _COLEMAK,
-    _PSEUDO,
-    _TENKEY,
-    _MOUSE,
-    _HHKB,
-    _SPACE_FN
-};
-
-enum custom_keycodes {
-    QWERTY = SAFE_RANGE,
-    DVORAK,
-    COLEMAK,
-    PSEUDO,
-    TENKEY,
-    MOUSE,
-    L_INNER,
-    R_INNER,
-    L_OUTER,
-    R_OUTER,
-    PSE_FN,
-    MACMODE,
-    DYNAMIC_MACRO_RANGE
-};
-// clang-format on
-
-/* Additional custom keycodes */
-#define MO_HHKB MO(_HHKB)
-#define LT_SPFN LT(_SPACE_FN, KC_SPC)
-#define DM_STA1 DM_REC1
-#define DM_PLY1 DM_PLY1
-
-/* User settings structure for the EEPROM */
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t base_layer : 8;
-        bool    mac_mode : 1;
-    };
-} user_config_t;
-
-user_config_t   user_config;
-static uint8_t  base_layer     = _QWERTY;
-static bool     mac_mode       = false;
-static bool     l_long_pressed = false;
-static bool     l_pressed      = false;
-static uint16_t l_time         = 0;
-static bool     r_long_pressed = false;
-static bool     r_pressed      = false;
-static uint16_t r_time         = 0;
-
-static uint16_t l_inner = KC_NO;
-static uint16_t l_outer = KC_NO;
-static uint16_t r_inner = KC_NO;
-static uint16_t r_outer = KC_NO;
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Qwerty Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_QWERTY] = LAYOUT(
-        KC_ESC,  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_GRV,  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,
-        KC_LCTL, 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, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Dvorak Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  [  |  ]  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  '  |  ,  |  .  |  P  |  Y  |  F  |  G  |  C  |  R  |  L  |  /  |  =  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  O  |  E  |  U  |  I  |  D  |  H  |  T  |  N  |  S  |  -  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  ;  |  Q  |  J  |  K  |  X  |  B  |  M  |  W  |  V  |  Z  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_DVORAK] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC, KC_GRV,  KC_BSPC,
-        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS,
-        KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, KC_ENT,
-        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Colemak Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  `  | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |  Q  |  W  |  F  |  P  |  G  |  J  |  L  |  U  |  Y  |  ;  |  [  |  ]  |   \    |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |  A  |  R  |  S  |  T  |  D  |  H  |  N  |  E  |  I  |  O  |  '  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |  Z  |  X  |  C  |  V  |  B  |  K  |  M  |  ,  |  .  |  /  | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_COLEMAK] = LAYOUT(
-        KC_ESC,  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_GRV,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Pseudo Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn| BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn| PseFn  |
-     * |-----------------------------------------------------------------------------------------|
-     * | Control  |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |    Shift    |PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|PseFn|  Shift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_PSEUDO] = LAYOUT(
-        KC_ESC,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_BSPC,
-        KC_TAB,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,
-        KC_LCTL, PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_ENT,
-        KC_LSFT, PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  PSE_FN,  KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, R_INNER, R_OUTER
-        ),
-
-    /* Tenkey layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc |     |     |     |     |     |     |     |     |     |  /  |  *  |  -  |     | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |     |     |     |     |     |     |     |     |  7  |  8  |  9  |  +  |        |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |     |     |     |     |     |     |     |     |  4  |  5  |  6  |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |     |     |     |     |     |     |     |  1  |  2  |  3  |    +    |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |              SpaceFN              |   0    |  .  |
-     *           `-----------------------------------------------------------------'
-     */
-    [_TENKEY] = LAYOUT(
-        KC_ESC,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSLS, KC_PAST, KC_PMNS, XXXXXXX, KC_BSPC,
-        KC_TAB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, XXXXXXX,
-        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P4,   KC_P5,   KC_P6,   KC_PENT,
-        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PPLS, MO_HHKB,
-        L_OUTER, L_INNER, LT_SPFN, KC_P0,   KC_PDOT
-        ),
-
-    /* Mouse layer
-     * ,-----------------------------------------------------------------------------------------.
-     * | Esc | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | BS  |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Tab   |     |     |     |     |     | WhL | WhD | WhU | WhR |     |     |     |        |
-     * |-----------------------------------------------------------------------------------------|
-     * | LControl |     |     |     |     |     | MsL | MsD | MsU | MsR |     |     |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |   LShift    |     |     |     |     |     | Mb1 | Mb2 | Mb3 |     |     | RShift  |HHKB |
-     * `-----------------------------------------------------------------------------------------'
-     *           |LOutr| LInner |                Mb1                | RInner |ROutr|
-     *           `-----------------------------------------------------------------'
-     */
-    [_MOUSE] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_BSPC,
-        KC_TAB,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-        KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX, XXXXXXX, KC_ENT,
-        KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN3, XXXXXXX, XXXXXXX, KC_RSFT, MO_HHKB,
-        L_OUTER, L_INNER, KC_BTN1, R_INNER, R_OUTER
-        ),
-
-    /* HHKB Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * |Power| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
-     * |-----------------------------------------------------------------------------------------|
-     * |  Caps  |Qwert|Dvork|Colmk|Psedo|Tenky|Mouse|     |PScr |SLck |Paus | Up  |     | Clear  |
-     * |-----------------------------------------------------------------------------------------|
-     * |          |VolD |VolU |Mute |Ejct |     |  *  |  /  |Home |PgUp |Left |Rght |   Enter    |
-     * |-----------------------------------------------------------------------------------------|
-     * |             |Sta1 |Ply1 |     | Mac |     |  +  |  -  | End |PgDn |Down |         |     |
-     * `-----------------------------------------------------------------------------------------'
-     *           |     |        |               Space               |        |     |
-     *           `-----------------------------------------------------------------'
-     */
-    [_HHKB] = LAYOUT(
-        KC_PWR,  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_INS,  KC_DEL,
-        KC_CAPS, QWERTY,  DVORAK,  COLEMAK, PSEUDO,  TENKEY,  MOUSE,   XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP,   XXXXXXX, KC_NUM,
-        _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, XXXXXXX, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
-        _______, DM_STA1, DM_PLY1, XXXXXXX, MACMODE, XXXXXXX, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
-        _______, _______, KC_SPC,  _______, _______
-        ),
-
-    /* SpaceFN Layer
-     * ,-----------------------------------------------------------------------------------------.
-     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     | Del |
-     * |-----------------------------------------------------------------------------------------|
-     * |        |Home | Up  | End |     |     |     |Home | End |     |PScr |SLck |Paus |  Ins   |
-     * |-----------------------------------------------------------------------------------------|
-     * |          |Left |Down |Rght |PgUp |     |Left |Down | Up  |Rght |     |     |            |
-     * |-----------------------------------------------------------------------------------------|
-     * |             |     |     |PgDn |     | Spc |     |PgDn |PgUp |     |     |         |     |
-     * `-----------------------------------------------------------------------------------------'
-     *           |     |        |                                   |        |     |
-     *           `-----------------------------------------------------------------'
-     */
-    [_SPACE_FN] = LAYOUT(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_DEL,
-        _______, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_HOME, KC_END,  XXXXXXX, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX, _______,
-        _______, XXXXXXX, XXXXXXX, KC_PGDN, XXXXXXX, KC_SPC,  XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, XXXXXXX, _______, XXXXXXX,
-        _______, _______, _______, _______, _______
-        ),
-};
-// clang-format on
-
-void set_mac_mode_keys(bool mac_mode) {
-    if (mac_mode) {
-        l_inner = KC_LCMD;
-        l_outer = KC_LOPT;
-        r_inner = KC_RCMD;
-        r_outer = KC_ROPT;
-    } else {
-        l_inner = KC_LALT;
-        l_outer = KC_LGUI;
-        r_inner = KC_RALT;
-        r_outer = KC_RGUI;
-    }
-}
-
-void keyboard_post_init_user(void) {
-    user_config.raw = eeconfig_read_user();
-    mac_mode        = user_config.mac_mode;
-    base_layer      = user_config.base_layer;
-    set_mac_mode_keys(mac_mode);
-}
-
-/* Set default values for the EEPROM */
-void eeconfig_init_user(void) {
-    user_config.raw        = 0;
-    user_config.base_layer = _QWERTY;
-    user_config.mac_mode   = false;
-    eeconfig_update_user(user_config.raw);
-    base_layer = _QWERTY;
-    mac_mode   = false;
-    set_mac_mode_keys(mac_mode);
-}
-
-void persistent_default_layer_set(uint8_t layer) {
-    set_single_persistent_default_layer(layer);
-    user_config.base_layer = layer;
-    eeconfig_update_user(user_config.raw);
-    base_layer = layer;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case QWERTY:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_QWERTY);
-            }
-            return false;
-        case DVORAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_DVORAK);
-            }
-            return false;
-        case COLEMAK:
-            if (record->event.pressed) {
-                persistent_default_layer_set(_COLEMAK);
-            }
-            return false;
-        case PSEUDO:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-                // set_single_persistent_default_layer(_PSEUDO);
-            }
-            return false;
-        case TENKEY:
-            if (record->event.pressed) {
-                default_layer_set(1U << _TENKEY);
-            }
-            return false;
-        case MOUSE:
-            if (record->event.pressed) {
-                default_layer_set(1U << _MOUSE);
-            }
-            return false;
-        case L_INNER:
-            if (record->event.pressed) {
-                l_pressed = true;
-                l_time    = record->event.time;
-            } else {
-                if (l_pressed) {
-                    if (l_long_pressed) {
-                        unregister_code(l_inner);
-                        l_long_pressed = false;
-                    } else {
-                        if (TIMER_DIFF_16(record->event.time, l_time) < TAPPING_TERM) {
-                            if (mac_mode) {
-                                register_code(KC_LNG2);
-                                unregister_code(KC_LNG2);
-                            } else {
-                                register_code(KC_INT5);
-                                unregister_code(KC_INT5);
-                            }
-                        } else {
-                            register_code(l_inner);
-                            unregister_code(l_inner);
-                        }
-                    }
-                    l_pressed = false;
-                }
-            }
-            return false;
-        case R_INNER:
-            if (record->event.pressed) {
-                r_pressed = true;
-                r_time    = record->event.time;
-            } else {
-                if (r_pressed) {
-                    if (r_long_pressed) {
-                        unregister_code(r_inner);
-                        r_long_pressed = false;
-                    } else {
-                        if (TIMER_DIFF_16(record->event.time, r_time) < TAPPING_TERM) {
-                            if (mac_mode) {
-                                register_code(KC_LNG1);
-                                unregister_code(KC_LNG1);
-                            } else {
-                                register_code(KC_INT2);
-                                unregister_code(KC_INT2);
-                            }
-                        } else {
-                            register_code(r_inner);
-                            unregister_code(r_inner);
-                        }
-                    }
-                    r_pressed = false;
-                }
-            }
-            return false;
-        case L_OUTER:
-            if (record->event.pressed) {
-                register_code(l_outer);
-            } else {
-                unregister_code(l_outer);
-            }
-            return false;
-        case R_OUTER:
-            if (record->event.pressed) {
-                register_code(r_outer);
-            } else {
-                unregister_code(r_outer);
-            }
-            return false;
-        case MACMODE:
-            if (record->event.pressed) {
-                /* Toggle Mac mode value */
-                mac_mode             = !mac_mode;
-                user_config.mac_mode = mac_mode;
-                eeconfig_update_user(user_config.raw);
-                set_mac_mode_keys(mac_mode);
-            }
-            return false;
-        case PSE_FN:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-            }
-            action_pseudo_process(record, base_layer, keymap_jis2us);
-            return false;
-        default:
-            if (record->event.pressed) {
-                if (l_pressed && !l_long_pressed) {
-                    register_code(l_inner);
-                    l_long_pressed = true;
-                }
-                if (r_pressed && !r_long_pressed) {
-                    register_code(r_inner);
-                    r_long_pressed = true;
-                }
-            }
-    }
-    return true;
-}
-
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case LT_SPFN:
-            return SPFN_TAPPING_TERM;
-        default:
-            return TAPPING_TERM;
-    }
-}
diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
deleted file mode 100644
index 163ae84fb4..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 shela
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "keymap_japanese.h"
-
-// clang-format off
-/* Keymap for converting JIS to US */
-const uint16_t PROGMEM keymap_jis2us[][2] = {
-    [KC_A ... KC_CAPS] = { 0x00, 0x00 }, /* default value */
-
-    [KC_1]    = { KC_1,    JP_EXLM }, /* 1 and ! -> 1 and ! */
-    [KC_2]    = { KC_2,    JP_AT   }, /* 2 and " -> 2 and @ */
-    [KC_3]    = { KC_3,    JP_HASH }, /* 3 and # -> 3 and # */
-    [KC_4]    = { KC_4,    JP_DLR  }, /* 4 and $ -> 4 and $ */
-    [KC_5]    = { KC_5,    JP_PERC }, /* 5 and % -> 5 and % */
-    [KC_6]    = { KC_6,    JP_CIRC }, /* 6 and & -> 6 and ^ */
-    [KC_7]    = { KC_7,    JP_AMPR }, /* 7 and ' -> 7 and & */
-    [KC_8]    = { KC_8,    JP_ASTR }, /* 8 and ( -> 8 and * */
-    [KC_9]    = { KC_9,    JP_LPRN }, /* 9 and ) -> 9 and ( */
-    [KC_0]    = { KC_0,    JP_RPRN }, /* 0       -> 0 and ) */
-    [KC_MINS] = { JP_MINS, JP_UNDS }, /* - and = -> - and _ */
-    [KC_EQL]  = { JP_EQL,  JP_PLUS }, /* ^ and ~ -> = and + */
-    [KC_LBRC] = { JP_LBRC, JP_LCBR }, /* @ and ` -> [ and { */
-    [KC_RBRC] = { JP_RBRC, JP_RCBR }, /* [ and { -> ] and } */
-    [KC_BSLS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_NUHS] = { JP_YEN,  JP_PIPE }, /* ] and } -> \ and | */
-    [KC_SCLN] = { JP_SCLN, JP_COLN }, /* ; and + -> ; and : */
-    [KC_QUOT] = { JP_QUOT, JP_DQUO }, /* : and * -> ' and " */
-    [KC_GRV]  = { JP_GRV,  JP_TILD }, /* Han/Zen -> ` and ~ */
-    [KC_COMM] = { JP_COMM, JP_LABK }, /* , and < -> , and < */
-    [KC_DOT]  = { JP_DOT,  JP_RABK }, /* . and > -> . and > */
-    [KC_SLSH] = { JP_SLSH, JP_QUES }, /* / and ? -> / and ? */
-};
-// clang-format on
diff --git a/keyboards/hhkb/ansi/keymaps/shela/readme.md b/keyboards/hhkb/ansi/keymaps/shela/readme.md
deleted file mode 100644
index 36e15c2c48..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/readme.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Shela's keymap for HHKB Pro 2 US Layout with Alternate Controller
-
-## Layers
-
-Layer 1: Qwerty Layer  
-Layer 2: Dvorak Layer  
-Layer 3: Colemak Layer  
-Layer 4: Pseudo US Layer  
-Layer 5: Tenkey Layer  
-Layer 6: Mouse Layer  
-Layer 7: HHKB Fn Layer  
-Layer 8: SpaceFN Layer  
-
-### Qwerty/Dvorak/Colemak Layer
-
-Basic keymap layer for each keyboard layout.
-
-### Pseudo US Layer
-
-A layer that can be used with the same physical layout as the previously activated basic (Qwerty/Dvorak/Colemak) keymap layer, with the keyboard still configured as a Japanese keyboard on the OS.
-
-This is useful when using virtual environments and remote desktops, because you can use Japanese Windows with the same keyboard without changing the OS keyboard settings. Also, when using the keyboard as a US keyboard on Windows OS, all keys existing only on Japanese keyboards are ignored and it is not possible to assign these keys to the desired function of any application. You can avoid such problems.
-
-### Tenkey/Mouse Layer
-
-Tenkey (numeric keypad) and mouse layers. For the Tenkey to work, Numlock must be turned on in the OS.
-
-### HHKB Fn Layer
-
-A layer that is equivalent to Fn key of Happy Hacking Keyboard. There are also some layer switching keys and special function keys.
-
-### SpaceFN Layer
-
-Customized [SpaceFN](https://geekhack.org/index.php?topic=51069.0) layer. There are left-hand and right-hand Arrows/Home/End/PageUp/PageDown keys. Frequently used keys in HHKB Fn layer are configured to this layer and can be used as an alternative layer to the HHKB Fn layer.
-
-## Special function keycodes
-
-### Pseudo US keycode
-
-A special keycode that implements Pseudo US Layout.
-
-### Mac mode keycode
-
-A special keycode that toggles Mac mode. When Mac mode is enabled, the keymap of the Left Inner/Outer and Right Inner/Outer keys are changed for macOS. See _Left Inner/Outer, Right Inner/Outer keys_ for details.
-
-### Left Inner/Outer, Right Inner/Outer keycodes
-
-If you tap a Mod-Tap key and another key within the time specified by TAPPING_TERM, QMK interprets these keys as if they were pressed at the same time even if they were not pressed simultaneously. Therefore, for fast typists, Mod-Tap can accidentally send a keycode with modifier. These special keycodes allow you to work around this issue and change the keymap in Mac mode.
-
-These keys work as follows:
-
-Mac mode: Disabled
-
-| Key         | Keycode | Tap     | Hold    |
-| ----------- | ------- | ------- | ------- |
-| Left Inner  | L_INNER | KC_INT5 | KC_LALT |
-| Left Outer  | L_OUTER | KC_LGUI | KC_LGUI |
-| Right Inner | R_INNER | KC_INT2 | KC_RALT |
-| Right Outer | R_OUTER | KC_RGUI | KC_RGUI |
-
-Mac mode: Enabled
-
-| Key         | Keycode | Tap     | Hold    |
-| ----------- | ------- | ------- | ------- |
-| Left Inner  | L_INNER | KC_LNG2 | KC_LCMD |
-| Left Outer  | L_OUTER | KC_LOPT | KC_LOPT |
-| Right Inner | R_INNER | KC_LNG1 | KC_RCMD |
-| Right Outer | R_OUTER | KC_ROPT | KC_ROPT |
diff --git a/keyboards/hhkb/ansi/keymaps/shela/rules.mk b/keyboards/hhkb/ansi/keymaps/shela/rules.mk
deleted file mode 100644
index 84f6395a48..0000000000
--- a/keyboards/hhkb/ansi/keymaps/shela/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-DYNAMIC_MACRO_ENABLE = yes
-
-SRC += action_pseudo.c
diff --git a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
deleted file mode 100644
index 4f0451f7a9..0000000000
--- a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define SPACE_FN LT(1, KC_SPC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT( //  default layer
-        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_RBRC, KC_GRV,
-        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_NUHS, KC_BSPC,
-        KC_LCTL, 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_NUBS,
-        KC_LALT, KC_LGUI,              SPACE_FN,                    KC_RGUI, KC_RALT),
-
-    [1] = LAYOUT(
-        KC_GRV,  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_INS,  KC_DEL,
-        KC_CAPS, KC_PGUP, KC_UP,   KC_PGDN,  _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, KC_END,           _______,
-        _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______,                             _______,                            _______, _______)
-};
diff --git a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md b/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md
deleted file mode 100644
index 0da9d96ee4..0000000000
--- a/keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# tobiasvl's ISO layout for HHKB
-
-This is my attempt to adapt my regular 60% Norwegian ISO layout to the physical HHKB layout, on the Happy Hacking Keyboard Pro 2 keyboard with the alternate QMK-compatible Hasu controller.
-
-## Base layer
-
-![HHKB ISO](https://i.imgur.com/8n4Kixw.png)
-
-The following changes have been made from standard HHKB:
-
-* The ] and \ keys are swapped so they're in the ISO locations, but a row higher. Whether or not this is a good idea depends heavily on what specific language layout you're using, but it makes sense for Norwegian, I think.
-* The Fn key is replaced with the ISO key (ie. "non-US backslash"). It's gotta go somewhere!
-* The spacebar doubles as space when tapped and Fn when held (ie. SpaceFN). This is a personal preference, but my second and more traditional choice would probably be to replace right GUI/Super with Fn.
-* Grave Escape has been added (shift + Esc produces ~).
-
-## Function layer
-
-This is just how I personally prefer to set up my function layer, and doesn't have anything to do with ISO. You probably want to swap out this wholesale for your own function layer.
-
-* Navigation is moved: Arrow keys on WASD, Page Up and Page Down on QE, Home and End on the right (I have them to the left of the vertical Enter on ISO layouts).
-* Grave Escape has been added (Fn + Esc produces \`).
-* No media keys or anything. I don't use them.