diff --git a/keyboards/suavity/hanjie/chconf.h b/keyboards/suavity/hanjie/chconf.h
deleted file mode 100644
index 35fb8831836..00000000000
--- a/keyboards/suavity/hanjie/chconf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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 .
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_FREQUENCY 10000
-
-#define CH_CFG_OPTIMIZE_SPEED FALSE
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next
-
diff --git a/keyboards/suavity/hanjie/config.h b/keyboards/suavity/hanjie/config.h
deleted file mode 100644
index 30a899432ad..00000000000
--- a/keyboards/suavity/hanjie/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2021 Suavity Designs
-
-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 .
-*/
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x5344 // 5344 short for "SD" (Suavity Designs)
-#define PRODUCT_ID 0x484A // 484A short for "HJ" (HanJie)
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Suavity Designs
-#define PRODUCT hanjie
-#define DESCRIPTION A Compact Southpaw FRL Custom Keyboard
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 19
-
-#define MATRIX_COL_PINS { B2, B1, B0, A7, A6, B11, B10, B12, B13, B14, B15, A8, A9, A10, A15, B3, B4, B5, B6 }
-// Matrix Column Pins: C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 C16 C17 C18
-#define MATRIX_ROW_PINS { A3, B7, A0, A1, A2 }
-// Matrix Row Pins: R0 R1 R2 R3 R4
-#define DIODE_DIRECTION COL2ROW
-// Current flow out of the diodes are from rows to columns
-
-#define LED_CAPS_LOCK_PIN B8
-#define LED_NUM_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F1
-#define LED_PIN_ON_STATE 1
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/suavity/hanjie/halconf.h b/keyboards/suavity/hanjie/halconf.h
deleted file mode 100644
index ef4743b7e80..00000000000
--- a/keyboards/suavity/hanjie/halconf.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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 .
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
-#pragma once
-
-#define HAL_USE_I2C TRUE
-
-// #define HAL_USE_PWM TRUE
-
-#define HAL_USE_SPI TRUE
-
-#include_next
-
diff --git a/keyboards/suavity/hanjie/hanjie.c b/keyboards/suavity/hanjie/hanjie.c
deleted file mode 100644
index c78bf69c37a..00000000000
--- a/keyboards/suavity/hanjie/hanjie.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "hanjie.h"
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A0);
- setPinOutput(A1);
- setPinOutput(A2);
-
- keyboard_pre_init_user();
-}
-
-bool led_update_kb(led_t led_state) {
- if (led_update_user(led_state)) {
- writePin(A2, led_state.num_lock);
- writePin(A0, led_state.caps_lock);
- writePin(A1, led_state.scroll_lock);
- }
- return true;
-}
diff --git a/keyboards/suavity/hanjie/hanjie.h b/keyboards/suavity/hanjie/hanjie.h
deleted file mode 100644
index 8f5af4fd21e..00000000000
--- a/keyboards/suavity/hanjie/hanjie.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default_split( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, \
- K41, K42, K43, K44, K45, K46, K47, K4B, K4G, K4H, K4I \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, }, \
- { KC_NO, K41, K42, K43, K44, K45, K46, K47, KC_NO, KC_NO, KC_NO, K4B, KC_NO, KC_NO, KC_NO, KC_NO, K4G, K4H, K4I } \
-}
diff --git a/keyboards/suavity/hanjie/info.json b/keyboards/suavity/hanjie/info.json
deleted file mode 100755
index cc95c6249b1..00000000000
--- a/keyboards/suavity/hanjie/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "keyboard_name": "hanjie",
- "url": "",
- "maintainer": "qmk",
- "width": 20.5,
- "height": 5.25,
- "layouts": {
- "LAYOUT": {
- "layout": [{"label":"-", "x":0, "y":0}, {"label":"*", "x":1, "y":0}, {"label":"/", "x":2, "y":0}, {"label":"Num Lock", "x":3, "y":0}, {"label":"Scroll Lock", "x":4.25, "y":0}, {"label":"~", "x":5.5, "y":0}, {"label":"!", "x":6.5, "y":0}, {"label":"@", "x":7.5, "y":0}, {"label":"#", "x":8.5, "y":0}, {"label":"$", "x":9.5, "y":0}, {"label":"%", "x":10.5, "y":0}, {"label":"^", "x":11.5, "y":0}, {"label":"&", "x":12.5, "y":0}, {"label":"*", "x":13.5, "y":0}, {"label":"(", "x":14.5, "y":0}, {"label":")", "x":15.5, "y":0}, {"label":"_", "x":16.5, "y":0}, {"label":"+", "x":17.5, "y":0}, {"label":"Backspace", "x":18.5, "y":0, "w":2}, {"label":"+", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"8", "x":2, "y":1}, {"label":"7", "x":3, "y":1}, {"label":"PgUp", "x":4.25, "y":1}, {"label":"Tab", "x":5.5, "y":1, "w":1.5}, {"label":"Q", "x":7, "y":1}, {"label":"W", "x":8, "y":1}, {"label":"E", "x":9, "y":1}, {"label":"R", "x":10, "y":1}, {"label":"T", "x":11, "y":1}, {"label":"Y", "x":12, "y":1}, {"label":"U", "x":13, "y":1}, {"label":"I", "x":14, "y":1}, {"label":"O", "x":15, "y":1}, {"label":"P", "x":16, "y":1}, {"label":"{", "x":17, "y":1}, {"label":"}", "x":18, "y":1}, {"label":"|", "x":19, "y":1, "w":1.5}, {"label":"=", "x":0, "y":2}, {"label":"6", "x":1, "y":2}, {"label":"5", "x":2, "y":2}, {"label":"4", "x":3, "y":2}, {"label":"PgDn", "x":4.25, "y":2}, {"label":"Caps Lock", "x":5.5, "y":2, "w":1.75}, {"label":"A", "x":7.25, "y":2}, {"label":"S", "x":8.25, "y":2}, {"label":"D", "x":9.25, "y":2}, {"label":"F", "x":10.25, "y":2}, {"label":"G", "x":11.25, "y":2}, {"label":"H", "x":12.25, "y":2}, {"label":"J", "x":13.25, "y":2}, {"label":"K", "x":14.25, "y":2}, {"label":"L", "x":15.25, "y":2}, {"label":":", "x":16.25, "y":2}, {"label":"\"", "x":17.25, "y":2}, {"label":"Enter", "x":18.25, "y":2, "w":2.25}, {"label":"Enter", "x":0, "y":3, "h":2}, {"label":"3", "x":1, "y":3}, {"label":"2", "x":2, "y":3}, {"label":"1", "x":3, "y":3}, {"label":"Shift", "x":5.5, "y":3, "w":2.25}, {"label":"Z", "x":7.75, "y":3}, {"label":"X", "x":8.75, "y":3}, {"label":"C", "x":9.75, "y":3}, {"label":"V", "x":10.75, "y":3}, {"label":"B", "x":11.75, "y":3}, {"label":"N", "x":12.75, "y":3}, {"label":"M", "x":13.75, "y":3}, {"label":"<", "x":14.75, "y":3}, {"label":">", "x":15.75, "y":3}, {"label":"?", "x":16.75, "y":3}, {"label":"Shift", "x":17.75, "y":3, "w":1.75}, {"label":"Fn", "x":19.5, "y":3}, {"label":"\u2191", "x":4.25, "y":3.25}, {"label":".", "x":1, "y":4}, {"label":"0", "x":2, "y":4}, {"label":"Win", "x":6.5, "y":4, "w":1.25}, {"label":"Alt", "x":7.75, "y":4, "w":1.5}, {"x":9.25, "y":4, "w":7}, {"label":"Alt", "x":16.25, "y":4, "w":1.5}, {"label":"Win", "x":17.75, "y":4, "w":1.25}, {"label":"Ctrl", "x":19, "y":4, "w":1.5}, {"label":"\u2190", "x":3.25, "y":4.25}, {"label":"\u2193", "x":4.25, "y":4.25}, {"label":"\u2192", "x":5.25, "y":4.25}]
- }
- }
-}
diff --git a/keyboards/suavity/hanjie/keymaps/default/keymap.c b/keyboards/suavity/hanjie/keymaps/default/keymap.c
deleted file mode 100755
index 862732f3beb..00000000000
--- a/keyboards/suavity/hanjie/keymaps/default/keymap.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 Suavity Designs
-
-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 .
-*/
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_default_split(
- KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_SLCK, 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_PPLS, KC_P9, KC_P8, KC_P7, KC_PGUP, 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_PEQL, KC_P6, KC_P5, KC_P4, KC_PGDN, 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_DEL,
- KC_PENT, KC_P3, KC_P2, KC_P1, KC_UP, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
- KC_PDOT, KC_P0, KC_LEFT, KC_DOWN, KC_RGHT, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
-
- [1] = LAYOUT_default_split(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 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_MUTE,
- 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC__VOLUP,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CLCK, 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__VOLDOWN,
- 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/suavity/hanjie/keymaps/via/keymap.c b/keyboards/suavity/hanjie/keymaps/via/keymap.c
deleted file mode 100644
index 32147ce7d96..00000000000
--- a/keyboards/suavity/hanjie/keymaps/via/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2021 Suavity Designs
-
-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 .
-*/
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_default_split(
- KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_SLCK, 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_PPLS, KC_P9, KC_P8, KC_P7, KC_PGUP, 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_PEQL, KC_P6, KC_P5, KC_P4, KC_PGDN, 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_DEL,
- KC_PENT, KC_P3, KC_P2, KC_P1, KC_UP, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
- KC_PDOT, KC_P0, KC_LEFT, KC_DOWN, KC_RGHT, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
-
-
- [1] = LAYOUT_default_split(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 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_TRNS,
- 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CLCK, 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_TRNS,
- 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-
- [2] = LAYOUT_default_split(
- 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
- [3] = LAYOUT_default_split(
- 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
diff --git a/keyboards/suavity/hanjie/keymaps/via/rules.mk b/keyboards/suavity/hanjie/keymaps/via/rules.mk
deleted file mode 100644
index 36b7ba9cbc9..00000000000
--- a/keyboards/suavity/hanjie/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/suavity/hanjie/mcuconf.h b/keyboards/suavity/hanjie/mcuconf.h
deleted file mode 100644
index 5cea69887fc..00000000000
--- a/keyboards/suavity/hanjie/mcuconf.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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 .
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
- */
-
-#pragma once
-
-#include_next
-
-#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
-
-// #undef STM32_PWM_USE_TIM3
-// #define STM32_PWM_USE_TIM3 TRUE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 TRUE
-
diff --git a/keyboards/suavity/hanjie/readme.md b/keyboards/suavity/hanjie/readme.md
deleted file mode 100644
index c94ae7162bc..00000000000
--- a/keyboards/suavity/hanjie/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# ehan: A Split 10.5°, F13 TKL designed by Suavity Designs | QMK Firmware
-
-
- 
-
-
-## Introduction
-
-hanjie is a compact southpaw function-row-less keyboard.
-
-* Keyboard Maintainer: [Suavity Designs](https://github.com/suavity)
-* Hardware Supported: ARM STM32F072CBT6
-* Hardware Availability: [suavity.cc/ehan](https://suavity.cc/keyboards/ehan/)
-
-The latest iteration of the PCB is v2.80 as of 03/21. This is noted on the back of the PCB.
-* Default Keymap: [See here](http://www.keyboard-layout-editor.com/#/gists/d89c177b7fa97ca1c0ff039b9b176665)
-* PCB Supported Layouts: [See here](http://www.keyboard-layout-editor.com/#/gists/9aab5e15a89469138da760f968df26ae)
-
-## How to compile
-
-After setting up your build environment, you can compile the hanjie default keymap by using:
-
- make suavity/ehan:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/suavity/hanjie/rules.mk b/keyboards/suavity/hanjie/rules.mk
deleted file mode 100644
index 565dc183567..00000000000
--- a/keyboards/suavity/hanjie/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# MCU name
-MCU = STM32F072
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # USB Nkey Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE