Bugfix for Jacky Studio keyboards (#11981)

PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories.

This commit removes the source from the old directories.

35 files changed, 0 insertions, 4304 deletions

diff --git a/keyboards/bear_65/bear_65.c b/keyboards/bear_65/bear_65.c
deleted file mode 100644
index a2ae572b82..0000000000
--- a/keyboards/bear_65/bear_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 "bear_65.h"
diff --git a/keyboards/bear_65/bear_65.h b/keyboards/bear_65/bear_65.h
deleted file mode 100644
index 94ec89c889..0000000000
--- a/keyboards/bear_65/bear_65.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 "quantum.h"
-
-#define LAYOUT_all( \
-      K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   K4E, \
-     K1E,  K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, K1B, K1C, K1D,        \
-    K2E,   K20, K21, K22, K23, K24, K25,           K26, K27, K28, K29,  K2A,  K2B,   K2D,         \
-           K30,   K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C,   K3D, K3E,      \
-           K40,     K43,    K45,      K46,               K48,     K4A,             K4B, K4C, K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, KC_NO, K43,   KC_NO, K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
-
-#define LAYOUT_full_bs( \
-      K31, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C,   K0D,      K4E, \
-     K1E,  K10, K11, K12, K13, K14, K15,           K16, K17, K18, K19, K1A, K1B, K1C, K1D,        \
-    K2E,   K20, K21, K22, K23, K24, K25,           K26, K27, K28, K29,  K2A,  K2B,   K2D,         \
-           K30,   K32, K33, K34, K35, K36,         K37, K38, K39, K3A, K3B, K3C,   K3D, K3E,      \
-           K40,     K43,    K45,      K46,               K48,     K4A,             K4B, K4C, K4D  \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   KC_NO, KC_NO, K43,   KC_NO, K45,   K46,   KC_NO, K48,   KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}
diff --git a/keyboards/bear_65/config.h b/keyboards/bear_65/config.h
deleted file mode 100644
index 1b7524f074..0000000000
--- a/keyboards/bear_65/config.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright 2020 MudkipMao
-
-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 "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xA13B // Jacky's vendor ID, arbitrarily selected by MudkipMao
-#define PRODUCT_ID      0x000A
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Jacky
-#define PRODUCT         Jacky Bear 65 Ergo
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* Setting the matrix value of top left key for bootmagic lite */
-#define BOOTMAGIC_LITE_ROW      3
-#define BOOTMAGIC_LITE_COLUMN   1
-
-#define DIODE_DIRECTION ROW2COL
-
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 4
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
-    #define RGBLED_NUM 15
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 139 /* The maximum brightness level */
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/bear_65/info.json b/keyboards/bear_65/info.json
deleted file mode 100644
index 67fc090af8..0000000000
--- a/keyboards/bear_65/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "keyboard_name": "Bear 65",
-    "url": "https://qmk.fm/keyboards",
-    "maintainer": "qmk",
-    "width": 20.75,
-    "height": 5,
-    "layouts": {
-        "LAYOUT_all": {
-             "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"~", "x":18.25, "y":0}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"Backspace", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
-        },
-        "LAYOUT_full_bs": {
-            "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":11.25, "y":0}, {"label":"*", "x":12.25, "y":0}, {"label":"(", "x":13.25, "y":0}, {"label":")", "x":14.25, "y":0}, {"label":"_", "x":15.25, "y":0}, {"label":"+", "x":16.25, "y":0}, {"label":"Backspace", "x":17.25, "y":0, "w":2}, {"label":"Del", "x":19.75, "y":0}, {"label":"PgUp", "x":0.25, "y":1}, {"label":"Tab", "x":1.75, "y":1, "w":1.5}, {"label":"Q", "x":3.25, "y":1}, {"label":"W", "x":4.25, "y":1}, {"label":"E", "x":5.25, "y":1}, {"label":"R", "x":6.25, "y":1}, {"label":"T", "x":7.25, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"{", "x":15.75, "y":1}, {"label":"}", "x":16.75, "y":1}, {"label":"|", "x":17.75, "y":1, "w":1.5}, {"label":"PgDn", "x":0, "y":2}, {"label":"Caps Lock", "x":1.75, "y":2, "w":1.75}, {"label":"A", "x":3.5, "y":2}, {"label":"S", "x":4.5, "y":2}, {"label":"D", "x":5.5, "y":2}, {"label":"F", "x":6.5, "y":2}, {"label":"G", "x":7.5, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"\"", "x":16, "y":2}, {"label":"Enter", "x":17, "y":2, "w":2.25}, {"label":"Shift", "x":1.75, "y":3, "w":2.25}, {"label":"Z", "x":4, "y":3}, {"label":"X", "x":5, "y":3}, {"label":"C", "x":6, "y":3}, {"label":"V", "x":7, "y":3}, {"label":"B", "x":8, "y":3}, {"label":"B", "x":10.5, "y":3}, {"label":"N", "x":11.5, "y":3}, {"label":"M", "x":12.5, "y":3}, {"label":"<", "x":13.5, "y":3}, {"label":">", "x":14.5, "y":3}, {"label":"?", "x":15.5, "y":3}, {"label":"Shift", "x":16.5, "y":3, "w":1.75}, {"label":"Up", "x":18.25, "y":3}, {"label":"Ctrl", "x":1.75, "y":4, "w":1.5}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"label":"Win", "x":8.25, "y":4}, {"x":10.5, "y":4, "w":2.75}, {"label":"Alt", "x":13.25, "y":4, "w":1.5}, {"label":"Left", "x":17.25, "y":4}, {"label":"Down", "x":18.25, "y":4}, {"label":"Right", "x":19.25, "y":4}]
-        }
-    }
-}
diff --git a/keyboards/bear_65/keymaps/default/keymap.c b/keyboards/bear_65/keymaps/default/keymap.c
deleted file mode 100644
index b7d5cdf61c..0000000000
--- a/keyboards/bear_65/keymaps/default/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_all(
-             KC_ESC,  KC_GRV, 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_GRV,     KC_DEL,
-            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_PGDN,   KC_CAPS, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-                      KC_LCTL,     KC_LALT, KC_SPC, KC_LGUI,                KC_SPC,     MO(_FN),                        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [_FN] = LAYOUT_all(
-             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,  _______, _______,     _______,
-            RGB_MOD,  _______, KC_BRID, KC_BRIU, _______, _______, _______,                 _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
-           RGB_TOG,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,                _______, _______, _______, _______,  _______,   _______,   _______,
-                      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,                _______, _______, _______, _______, _______, _______, _______, _______,
-                      _______,     _______, _______, _______,                _______,     _______,                        _______, _______,_______ 
-    )
-};
diff --git a/keyboards/bear_65/keymaps/default/readme.md b/keyboards/bear_65/keymaps/default/readme.md
deleted file mode 100644
index d517348557..0000000000
--- a/keyboards/bear_65/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for bear_65
diff --git a/keyboards/bear_65/keymaps/via/keymap.c b/keyboards/bear_65/keymaps/via/keymap.c
deleted file mode 100644
index 2ddc5b43d8..0000000000
--- a/keyboards/bear_65/keymaps/via/keymap.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_full_bs(
-             KC_ESC,  KC_GRV, 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_DEL,
-            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_PGDN,   KC_CAPS, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-                      KC_LCTL,     KC_LALT, KC_SPC, KC_LGUI,                KC_SPC,     MO(1),                        KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT_full_bs(
-             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,  _______,     _______,
-            RGB_MOD,  _______, KC_BRID, KC_BRIU, _______, _______, _______,                 _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______,
-           RGB_TOG,   _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______,                _______, _______, _______, _______,  _______,   _______,   _______,
-                      _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,                _______, _______, _______, _______, _______, _______, _______, _______,
-                      _______,     _______, _______, _______,                _______,     _______,                        _______, _______,_______ 
-    ),
-    [2] = LAYOUT_full_bs(
-             _______,   _______, _______,   _______,   _______,   _______,   _______,   _______,          _______,   _______,   _______,   _______,  _______,  _______,  _______,     _______,
-            _______,  _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______,
-           _______,   _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,  _______,   _______,   _______,
-                      _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______, _______, _______,
-                      _______,     _______, _______, _______,                _______,     _______,                        _______, _______,_______ 
-    ),
-    [3] = LAYOUT_full_bs(
-             _______,   _______, _______,   _______,   _______,   _______,   _______,   _______,          _______,   _______,   _______,   _______,  _______,  _______,  _______,     _______,
-            _______,  _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______, _______, _______,
-           _______,   _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,  _______,   _______,   _______,
-                      _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______, _______, _______, _______, _______,
-                      _______,     _______, _______, _______,                _______,     _______,                        _______, _______,_______ 
-    )
-};
diff --git a/keyboards/bear_65/keymaps/via/readme.md b/keyboards/bear_65/keymaps/via/readme.md
deleted file mode 100644
index 5cb67ab25f..0000000000
--- a/keyboards/bear_65/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The via keymap for bear_65
diff --git a/keyboards/bear_65/keymaps/via/rules.mk b/keyboards/bear_65/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/bear_65/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/bear_65/readme.md b/keyboards/bear_65/readme.md
deleted file mode 100644
index 44a5e95537..0000000000
--- a/keyboards/bear_65/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Bear 65
-
-![Bear 65](https://i.imgur.com/W1sVP1Tl.jpg)
-
-A gasket-mounted 65% keyboard inspired by the [TGR Alice](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tgr/alice). Designed and produced by [jacky](https://geekhack.org/index.php?action=profile;u=63864) from Geekhack.
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: Bear 65
-* Hardware Availability: The GB happened July 15th 2020, units are still in production
-
-Make example for this keyboard (after setting up your build environment):
-
-    make bear_65:default
-
-Flashing example for this keyboard:
-
-    make bear_65:default:flash
-
-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/bear_65/rules.mk b/keyboards/bear_65/rules.mk
deleted file mode 100644
index 339c37c7ee..0000000000
--- a/keyboards/bear_65/rules.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Use LTO flags to reduce firmware size
diff --git a/keyboards/s7_elephant/.noci b/keyboards/s7_elephant/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/s7_elephant/.noci
+++ /dev/null
diff --git a/keyboards/s7_elephant/readme.md b/keyboards/s7_elephant/readme.md
deleted file mode 100644
index 76838be218..0000000000
--- a/keyboards/s7_elephant/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# S7 Elephant
-
-![S7 Elephant](https://i.imgur.com/CaHxKBJ.jpg)
-
-A high-end 70% custom keyboard designed and produced by [jacky](https://geekhack.org/index.php?action=profile;u=63864) from Geekhack.
-
-**Firmware files are SPECIFIC to each revision. Firmware files from rev1 will not work on rev2 and vice versa.** Please use the `.hex` appropriate for your board.
-
-* Keyboard Maintainer: QMK Community
-* Hardware Supported: S7 Elephant rev1, rev2
-* Hardware Availability: [The GB has had 2 rounds with little chance to run again.](https://geekhack.org/index.php?topic=96434.0)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make s7_elephant/rev1:default # 2018 run
-    make s7_elephant/rev2:default # 2019 run
-
-To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
-
-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/s7_elephant/rev1/.noci b/keyboards/s7_elephant/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/s7_elephant/rev1/.noci
+++ /dev/null
diff --git a/keyboards/s7_elephant/rev1/config.h b/keyboards/s7_elephant/rev1/config.h
deleted file mode 100644
index 700b0326c2..0000000000
--- a/keyboards/s7_elephant/rev1/config.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xA13B // Hexidecimal A13B will be Jacky's vendor ID
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    jacky
-#define PRODUCT         S7 Elephant
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 }
-#define MATRIX_COL_PINS { B6, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7, F1 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 2
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_SLEEP
-#endif
-
-/* 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/s7_elephant/rev1/info.json b/keyboards/s7_elephant/rev1/info.json
deleted file mode 100644
index 3d45f0b094..0000000000
--- a/keyboards/s7_elephant/rev1/info.json
+++ /dev/null
@@ -1,2348 +0,0 @@
-{
-    "keyboard_name": "S7 Elephant",
-    "url": "https://geekhack.org/index.php?topic=96434.0",
-    "maintainer": "qmk",
-    "width": 18,
-    "height": 5,
-    "layouts": {
-        "LAYOUT_ansi": {
-            "key_count": 72,
-            "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"Esc", "x":2, "y":0},
-                {"label":"!", "x":3, "y":0},
-                {"label":"@", "x":4, "y":0},
-                {"label":"#", "x":5, "y":0},
-                {"label":"$", "x":6, "y":0},
-                {"label":"%", "x":7, "y":0},
-                {"label":"^", "x":8, "y":0},
-                {"label":"&", "x":9, "y":0},
-                {"label":"*", "x":10, "y":0},
-                {"label":"(", "x":11, "y":0},
-                {"label":")", "x":12, "y":0},
-                {"label":"_", "x":13, "y":0},
-                {"label":"+", "x":14, "y":0},
-                {"label":"Backspace", "x":15, "y":0, "w":2},
-                {"label":"Home", "x":17, "y":0},
-                {"label":"F2", "x":0, "y":1},
-                {"label":"Tab", "x":2, "y":1, "w":1.5},
-                {"label":"Q", "x":3.5, "y":1},
-                {"label":"W", "x":4.5, "y":1},
-                {"label":"E", "x":5.5, "y":1},
-                {"label":"R", "x":6.5, "y":1},
-                {"label":"T", "x":7.5, "y":1},
-                {"label":"Y", "x":8.5, "y":1},
-                {"label":"U", "x":9.5, "y":1},
-                {"label":"I", "x":10.5, "y":1},
-                {"label":"O", "x":11.5, "y":1},
-                {"label":"P", "x":12.5, "y":1},
-                {"label":"{", "x":13.5, "y":1},
-                {"label":"}", "x":14.5, "y":1},
-                {"label":"|", "x":15.5, "y":1, "w":1.5},
-                {"label":"End", "x":17, "y":1},
-                {"label":"F3", "x":0, "y":2},
-                {"label":"Caps Lock", "x":2, "y":2, "w":1.75},
-                {"label":"A", "x":3.75, "y":2},
-                {"label":"S", "x":4.75, "y":2},
-                {"label":"D", "x":5.75, "y":2},
-                {"label":"F", "x":6.75, "y":2},
-                {"label":"G", "x":7.75, "y":2},
-                {"label":"H", "x":8.75, "y":2},
-                {"label":"J", "x":9.75, "y":2},
-                {"label":"K", "x":10.75, "y":2},
-                {"label":"L", "x":11.75, "y":2},
-                {"label":":", "x":12.75, "y":2},
-                {"label":"\"", "x":13.75, "y":2},
-                {"label":"Enter", "x":14.75, "y":2, "w":2.25},
-                {"label":"Ins", "x":17, "y":2},
-                {"label":"F4", "x":0, "y":3},
-                {"label":"Shift", "x":2, "y":3, "w":2.25},
-                {"label":"Z", "x":4.25, "y":3},
-                {"label":"X", "x":5.25, "y":3},
-                {"label":"C", "x":6.25, "y":3},
-                {"label":"V", "x":7.25, "y":3},
-                {"label":"B", "x":8.25, "y":3},
-                {"label":"N", "x":9.25, "y":3},
-                {"label":"M", "x":10.25, "y":3},
-                {"label":"<", "x":11.25, "y":3},
-                {"label":">", "x":12.25, "y":3},
-                {"label":"?", "x":13.25, "y":3},
-                {"label":"Shift", "x":14.25, "y":3, "w":1.75},
-                {"label":"Up", "x":16, "y":3},
-                {"label":"Del", "x":17, "y":3},
-                {"label":"F5", "x":0, "y":4},
-                {"label":"Ctrl", "x":2, "y":4, "w":1.25},
-                {"label":"Win", "x":3.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":4.5, "y":4, "w":1.25},
-                {"x":5.75, "y":4, "w":6.25},
-                {"label":"Fn", "x":12, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5},
-                {"label":"Left", "x":15, "y":4},
-                {"label":"Down", "x":16, "y":4},
-                {"label":"Right", "x":17, "y":4}
-            ]
-        },
-        "LAYOUT_ansi_small_lshift": {
-            "key_count": 73,
-            "layout": [
-                {"label":"F1", "x":0, "y":0},
-                {"label":"Esc", "x":2, "y":0},
-                {"label":"!", "x":3, "y":0},
-                {"label":"@", "x":4, "y":0},
-                {"label":"#", "x":5, "y":0},
-                {"label":"$", "x":6, "y":0},
-                {"label":"%", "x":7, "y":0},
-                {"label":"^", "x":8, "y":0},
-                {"label":"&", "x":9, "y":0},
-                {"label":"*", "x":10, "y":0},
-                {"label":"(", "x":11, "y":0},
-                {"label":")", "x":12, "y":0},
-                {"label":"_", "x":13, "y":0},
-                {"label":"+", "x":14, "y":0},
-                {"label":"Backspace", "x":15, "y":0, "w":2},
-                {"label":"Home", "x":17, "y":0},
-                {"label":"F2", "x":0, "y":1},
-                {"label":"Tab", "x":2, "y":1, "w":1.5},
-                {"label":"Q", "x":3.5, "y":1},
-                {"label":"W", "x":4.5, "y":1},
-                {"label":"E", "x":5.5, "y":1},
-                {"label":"R", "x":6.5, "y":1},
-                {"label":"T", "x":7.5, "y":1},
-                {"label":"Y", "x":8.5, "y":1},
-                {"label":"U", "x":9.5, "y":1},
-                {"label":"I", "x":10.5, "y":1},
-                {"label":"O", "x":11.5, "y":1},
-                {"label":"P", "x":12.5, "y":1},
-                {"label":"{", "x":13.5, "y":1},
-                {"label":"}", "x":14.5, "y":1},
-                {"label":"|", "x":15.5, "y":1, "w":1.5},
-                {"labe