4 files changed, 3 insertions, 9 deletions
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 50f23cb945..36875c543a 100644
--- a/keyboards/gboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "config_common.h"
 
 #define VERSION 		"Paula Deen"
 
-#define DEBOUNCE 5
 #define FORCE_NKRO
 
 /* key matrix size */
diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 158769dbd1..085d56f91e 100644
--- a/keyboards/gboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
@@ -8,6 +8,8 @@
         "pid": "0x1337",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_butter": {
             "layout": [
diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
index e05ccd047c..b4de1a5393 100644
--- a/keyboards/gboards/butterstick/rules.mk
+++ b/keyboards/gboards/butterstick/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/gboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
index 8820127848..5d6adcc1d0 100644
--- a/keyboards/gboards/butterstick/sten.c
+++ b/keyboards/gboards/butterstick/sten.c
@@ -370,7 +370,7 @@ void saveState(uint32_t cleanChord) {
 	for (int i = 0; i < 32; i++) 
 		pChordState[i] = chordState[i];
 }
-void restoreState() {
+void restoreState(void) {
 	cChord = pChord;
 	chordIndex = pChordIndex;
 	for (int i = 0; i < 32; i++)