10 files changed, 6 insertions, 15 deletions
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h
index 21f3aa0ab4..df17352d9c 100644
--- a/keyboards/crkbd/config.h
+++ b/keyboards/crkbd/config.h
@@ -61,5 +61,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-#define USE_SERIAL
diff --git a/keyboards/crkbd/keymaps/dsanchezseco/config.h b/keyboards/crkbd/keymaps/dsanchezseco/config.h
index bece69ba67..4fd8fc94c4 100644
--- a/keyboards/crkbd/keymaps/dsanchezseco/config.h
+++ b/keyboards/crkbd/keymaps/dsanchezseco/config.h
@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_MATRIX_I2C
-#define USE_SERIAL
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
diff --git a/keyboards/crkbd/keymaps/gotham/oled.c b/keyboards/crkbd/keymaps/gotham/oled.c
index c4ac5e736c..c285a37c5b 100644
--- a/keyboards/crkbd/keymaps/gotham/oled.c
+++ b/keyboards/crkbd/keymaps/gotham/oled.c
@@ -176,7 +176,7 @@ void add_keylog(uint16_t keycode) {
     keylog_str[i] = keylog_str[i - 1];
   }
 
-  if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+  if (keycode < ARRAY_SIZE(code_to_name)) {
     keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
   }
 }
diff --git a/keyboards/crkbd/keymaps/joe_scotto/config.h b/keyboards/crkbd/keymaps/joe_scotto/config.h
index e38d4a9183..c76937eae4 100644
--- a/keyboards/crkbd/keymaps/joe_scotto/config.h
+++ b/keyboards/crkbd/keymaps/joe_scotto/config.h
@@ -61,6 +61,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define USE_SERIAL
-
-#define TAPPING_TERM 50
-\ No newline at end of file
+#define TAPPING_TERM 50
diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h
index cf3e80b23e..fbe5277c40 100644
--- a/keyboards/crkbd/keymaps/julian_turner/config.h
+++ b/keyboards/crkbd/keymaps/julian_turner/config.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #undef MANUFACTURER
-#define MANUFACTURER Trner
+#define MANUFACTURER "Trner"
 
 /* Select hand configuration */
 #define MASTER_LEFT
diff --git a/keyboards/crkbd/keymaps/kidbrazil/config.h b/keyboards/crkbd/keymaps/kidbrazil/config.h
index 2801436709..fefb8eb0ee 100644
--- a/keyboards/crkbd/keymaps/kidbrazil/config.h
+++ b/keyboards/crkbd/keymaps/kidbrazil/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 150
 #undef PRODUCT
-#define PRODUCT         CRKBD Loose Transistor Ed.
+#define PRODUCT         "CRKBD Loose Transistor Ed."
 
 #ifdef RGBLIGHT_ENABLE
     //#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 994aef314e..fd53b57c68 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -131,7 +131,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_ONESHOT
 
 #undef PRODUCT
-#define PRODUCT Corne Keyboard
+#define PRODUCT "Corne Keyboard"
 
 #define LCPC_KEYS KC_LCTL, KC_LSFT, KC_9
 #define RCPC_KEYS KC_RCTL, KC_RSFT, KC_0
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/oled.c b/keyboards/crkbd/keymaps/thunderbird2086/oled.c
index bee9bc26de..108f3e0cdd 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/oled.c
+++ b/keyboards/crkbd/keymaps/thunderbird2086/oled.c
@@ -189,7 +189,7 @@ void add_keylog(uint16_t keycode) {
         keylog_str[i] = keylog_str[i - 1];
     }
 
-    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+    if (keycode < ARRAY_SIZE(code_to_name)) {
         keylog_str[0] = pgm_read_byte(&code_to_name[keycode]);
     }
 }
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
index e451612484..877a59fcc6 100644
--- a/keyboards/crkbd/r2g/config.h
+++ b/keyboards/crkbd/r2g/config.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* ws2812 RGB LED */
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 9f196a7166..d2a5a6b2c8 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
 /* ws2812 RGB LED */