4 files changed, 2 insertions, 26 deletions
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h
index 15df7c244f..95d332cf95 100644
--- a/keyboards/soda/cherish/config.h
+++ b/keyboards/soda/cherish/config.h
@@ -17,29 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 15
-
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8}
 #define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 }
 #define DIODE_DIRECTION COL2ROW
 
-//#define BACKLIGHT_PIN           A6
-//#define BACKLIGHT_PWM_DRIVER    PWMD3
-//#define BACKLIGHT_PWM_CHANNEL   1
-//#define BACKLIGHT_PAL_MODE      1
-//#define BACKLIGHT_LEVELS 6
-//#define BACKLIGHT_BREATHING
-//#define BREATHING_PERIOD 6
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* 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 */
diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json
index 8d6bea8947..713356f944 100644
--- a/keyboards/soda/cherish/info.json
+++ b/keyboards/soda/cherish/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEB52",
         "device_version": "0.0.1"
     },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
     "layout_aliases": {
         "LAYOUT_75_ansi": "LAYOUT"
     },
diff --git a/keyboards/soda/cherish/rules.mk b/keyboards/soda/cherish/rules.mk
index 55f433aaaa..4e0fe55873 100644
--- a/keyboards/soda/cherish/rules.mk
+++ b/keyboards/soda/cherish/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/soda/pocket/mcuconf.h b/keyboards/soda/pocket/mcuconf.h
index 033c89fa82..e139ee3683 100644
--- a/keyboards/soda/pocket/mcuconf.h
+++ b/keyboards/soda/pocket/mcuconf.h
@@ -20,4 +20,3 @@
 
 #undef STM32_I2C_USE_DMA
 #define STM32_I2C_USE_DMA FALSE
-