7 files changed, 8 insertions, 30 deletions
diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c
deleted file mode 100644
index 00ad12a23e..0000000000
--- a/keyboards/buzzard/buzzard.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "buzzard.h"
diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h
deleted file mode 100644
index f094e4af39..0000000000
--- a/keyboards/buzzard/buzzard.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Christoph Rehmann (crehmann)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_buzzard_rev1)
-#   include "rev1.h"
-#endif
-\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
index c5638c767d..181396ad26 100644
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -6,9 +6,6 @@
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
@@ -35,4 +32,4 @@
 #ifdef PS2_MOUSE_ENABLE
 #define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
 #define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif
-\ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
index 0f1db48977..2a42e17d0c 100644
--- a/keyboards/buzzard/keymaps/default/config.h
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -6,9 +6,6 @@
 // Configure the global tapping term (default: 200ms)
 #define TAPPING_TERM 200
 
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
 // Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
 #define QUICK_TAP_TERM 0
 
@@ -36,4 +33,4 @@
 #ifdef PS2_MOUSE_ENABLE
 #define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)   // using the right mouse button for scrolling (other buttons can be configured)
 #define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif
-\ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
index fb028e0f64..f29441fac8 100644
--- a/keyboards/buzzard/rev1/config.h
+++ b/keyboards/buzzard/rev1/config.h
@@ -3,15 +3,6 @@
 
 #pragma once
 
-// wiring
-#define MATRIX_ROW_PINS \
-    { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS \
-    { B1, B3, B2, B6, B5, B4}
-
-/* COL2ROW, 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 */
diff --git a/keyboards/buzzard/rev1/info.json b/keyboards/buzzard/rev1/info.json
index 173eb49e72..3cd9d387ca 100644
--- a/keyboards/buzzard/rev1/info.json
+++ b/keyboards/buzzard/rev1/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB077",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6", "B5", "B4"],
+        "rows": ["F4", "F5", "F6", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "D2"
     },
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
index c73e9164f0..74c5fef08e 100644
--- a/keyboards/buzzard/rev1/rev1.h
+++ b/keyboards/buzzard/rev1/rev1.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "buzzard.h"
+#include "quantum.h"
 
 /* This a shortcut to help you visually see your layout.
  *