2 files changed, 14 insertions, 73 deletions
diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json
index 90528d1bd9..e134a31147 100644
--- a/keyboards/rad/info.json
+++ b/keyboards/rad/info.json
@@ -19,50 +19,20 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {
-          "x": 1,
-          "y": 0
-        },
-        {
-          "x": 2,
-          "y": 0
-        },
-        {
-          "x": 0,
-          "y": 1
-        },
-        {
-          "x": 1,
-          "y": 1
-        },
-        {
-          "x": 2,
-          "y": 1
-        },
-        {
-          "x": 0,
-          "y": 2
-        },
-        {
-          "x": 1,
-          "y": 2
-        },
-        {
-          "x": 2,
-          "y": 2
-        },
-        {
-          "x": 0,
-          "y": 3
-        },
-        {
-          "x": 1,
-          "y": 3
-        },
-        {
-          "x": 2,
-          "y": 3
-        }
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3}
       ]
     }
   }
diff --git a/keyboards/rad/rad.h b/keyboards/rad/rad.h
deleted file mode 100644
index a9d669c929..0000000000
--- a/keyboards/rad/rad.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * 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( \
-         K01, K02, \
-    K10, K11, K12, \
-    K20, K21, K22, \
-    K30, K31, K32  \
-) { \
-    { KC_NO, K01,   K02 }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}