5 files changed, 6 insertions, 15 deletions
diff --git a/keyboards/salicylic_acid3/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
index 6672b0014c..26f1bf2661 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/config.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-#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 */
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index a798c25e63..b4013093cd 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+        "rows": ["D4", "C6", "D7", "E6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["numpad_6x4"],
diff --git a/keyboards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
index 772c843c57..c309296049 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/rev1.h
+++ b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "setta21.h"
+#include "quantum.h"
 
 #define LAYOUT_numpad_6x4( \
        L05, L15, L25, L35, \
diff --git a/keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c
deleted file mode 100644
index 73c07682f7..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "setta21.h"
diff --git a/keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h
deleted file mode 100644
index 9e5b17e2c3..0000000000
--- a/keyboards/salicylic_acid3/setta21/setta21.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_setta21_rev1
-  #include "rev1.h"
-#endif