diff --git a/Bluetooth.cpp b/Bluetooth.cpp
deleted file mode 100644
index 1ca3a51..0000000
--- a/Bluetooth.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "Bluetooth.h"
-
-#if MCU_VARIANT == MCU_NRF52
-bool SerialBT_init = false;
-#endif
-
-uint32_t bt_pairing_started = 0;
-uint8_t dev_bt_mac[BT_DEV_ADDR_LEN];
-char bt_da[BT_DEV_ADDR_LEN];
-char bt_dh[BT_DEV_HASH_LEN];
-char bt_devname[11];
diff --git a/Bluetooth.h b/Bluetooth.h
index 49a11ee..2dc7c24 100644
--- a/Bluetooth.h
+++ b/Bluetooth.h
@@ -1,5 +1,4 @@
 // Copyright (C) 2024, Mark Qvist
-
 // 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 3 of the License, or
@@ -12,7 +11,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
+
 #if MCU_VARIANT == MCU_ESP32
   #if HAS_BLUETOOTH == true
     #include "BluetoothSerial.h"
diff --git a/Boards.h b/Boards.h
index fe4bfe4..1229cf2 100644
--- a/Boards.h
+++ b/Boards.h
@@ -14,8 +14,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //#define BOARD_MODEL BOARD_HELTEC_MESHP
 //#define BOARD_MODEL BOARD_HELTEC_MESHP
-#include "board_config.h"
-
 #include "Interfaces.h"
 #include "ROM.h"
 
diff --git a/Config.h b/Config.h
index 205fb94..90c6b20 100644
--- a/Config.h
+++ b/Config.h
@@ -12,7 +12,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
+
 #include "ROM.h"
 #include "Boards.h"
 
diff --git a/Console.h b/Console.h
index dc9ca12..c59d348 100644
--- a/Console.h
+++ b/Console.h
@@ -12,7 +12,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
+
 #include <FS.h>
 #include <SPIFFS.h>
 #include <WiFi.h>
diff --git a/Device.h b/Device.h
index 5826ffc..26bb873 100644
--- a/Device.h
+++ b/Device.h
@@ -12,10 +12,8 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
 
 #include <Ed25519.h>
-
 #if MCU_VARIANT == MCU_ESP32
 #include "mbedtls/md.h"
 #include "esp_ota_ops.h"
diff --git a/Display.h b/Display.h
index c56fe43..70e2983 100644
--- a/Display.h
+++ b/Display.h
@@ -12,7 +12,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
+
 #include <Adafruit_GFX.h>
 
 #define DISP_W 128
diff --git a/Framing.h b/Framing.h
index 8ec4e5b..47a8eeb 100644
--- a/Framing.h
+++ b/Framing.h
@@ -12,7 +12,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
+
 #ifndef FRAMING_H
   #define FRAMING_H
 
diff --git a/Graphics.h b/Graphics.h
index 5e68c87..efd7480 100644
--- a/Graphics.h
+++ b/Graphics.h
@@ -12,7 +12,6 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
 
 const unsigned char bm_cable [] PROGMEM = {
    0x00, 0x00, 0x00, 0x1c, 0x00, 0x38, 0x07, 0xfc, 0x08, 0x38, 0x10, 0x1c, 0x10, 0x00, 0x08, 0x00, 
diff --git a/Input.h b/Input.h
index 3c45d6b..340efeb 100644
--- a/Input.h
+++ b/Input.h
@@ -12,7 +12,6 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
 #ifndef INPUT_H
   #define INPUT_H
   
diff --git a/Power.h b/Power.h
index 9b66725..ab0198c 100644
--- a/Power.h
+++ b/Power.h
@@ -12,7 +12,6 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
 
 #if BOARD_MODEL == BOARD_TBEAM || BOARD_MODEL == BOARD_TBEAM_S_V1
   #include <XPowersLib.h>
diff --git a/RNode_Firmware_CE.ino b/RNode_Firmware_CE.ino
index 075fff6..3ad9881 100644
--- a/RNode_Firmware_CE.ino
+++ b/RNode_Firmware_CE.ino
@@ -13,9 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //#define BOARD_MODEL BOARD_HELTEC_MESHP   // MeshPocket
-//BD
-#include "board_config.h"
-//BD
+
 #include <Arduino.h>
 #include <SPI.h>
 #include "Utilities.h"
diff --git a/Radio.cpp b/Radio.cpp
index 54ebc16..f82e4bc 100644
--- a/Radio.cpp
+++ b/Radio.cpp
@@ -4,9 +4,6 @@
 // Modifications and additions copyright 2024 by Mark Qvist & Jacob Eva
 // Obviously still under the MIT license.
 
-//BD
-#include "board_config.h"
-//BD
 #include "Radio.hpp"
 #include "src/misc/ModemISR.h"
 
diff --git a/Utilities.h b/Utilities.h
index 9a43988..39a07cb 100644
--- a/Utilities.h
+++ b/Utilities.h
@@ -12,8 +12,6 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#include "board_config.h"
-
 #include "Radio.hpp"
 #include "Config.h"