diff --git a/BLESerial.cpp b/BLESerial.cpp
index 2957755..3460a86 100644
--- a/BLESerial.cpp
+++ b/BLESerial.cpp
@@ -96,17 +96,6 @@ void BLESerial::flush() {
   }
 }
 
-void BLESerial::disconnect() {
-  if (ble_server->getConnectedCount() > 0) {
-    uint16_t conn_id = ble_server->getConnId();
-    // Serial.printf("Have connected: %d\n", conn_id);
-    ble_server->disconnect(conn_id);
-    // Serial.println("Disconnected");
-  } else {
-    // Serial.println("No connected");
-  }
-}
-
 void BLESerial::begin(const char *name) {
   ConnectedDeviceCount = 0;
   BLEDevice::init(name);
@@ -121,10 +110,7 @@ void BLESerial::begin(const char *name) {
   BLEDevice::setSecurityCallbacks(this);
 
   SetupSerialService();
-  this->startAdvertising();
-}
 
-void BLESerial::startAdvertising() {
   ble_adv = BLEDevice::getAdvertising();
   ble_adv->addServiceUUID(BLE_SERIAL_SERVICE_UUID);
   ble_adv->setMinPreferred(0x20);
@@ -133,11 +119,6 @@ void BLESerial::startAdvertising() {
   ble_adv->start();
 }
 
-void BLESerial::stopAdvertising() {
-  ble_adv = BLEDevice::getAdvertising();
-  ble_adv->stop();
-}
-
 void BLESerial::end() { BLEDevice::deinit(); }
 
 void BLESerial::onWrite(BLECharacteristic *characteristic) {
diff --git a/BLESerial.h b/BLESerial.h
index f845b56..7b6d1c6 100644
--- a/BLESerial.h
+++ b/BLESerial.h
@@ -78,9 +78,6 @@ public:
 
   void begin(const char *name);
   void end();
-  void disconnect();
-  void startAdvertising();
-  void stopAdvertising();
   void onWrite(BLECharacteristic *characteristic);
   int available();
   int peek();
diff --git a/Bluetooth.h b/Bluetooth.h
index 616c4b6..bbb0c82 100644
--- a/Bluetooth.h
+++ b/Bluetooth.h
@@ -38,7 +38,6 @@
   BLEUart SerialBT(BLE_RX_BUF);
   BLEDis  bledis;
   BLEBas  blebas;
-  bool SerialBT_init = false;
 #endif
 
 #define BT_PAIRING_TIMEOUT 35000
@@ -170,42 +169,31 @@ char bt_devname[11];
     }
 
   #elif HAS_BLE == true
-    bool bt_setup_hw(); void bt_security_setup();
     BLESecurity *ble_security = new BLESecurity();
     bool ble_authenticated = false;
     uint32_t pairing_pin = 0;
 
     void bt_flush() { if (bt_state == BT_STATE_CONNECTED) { SerialBT.flush(); } }
 
-    void bt_start() {
-      // Serial.println("BT start");
+    void bt_disable_pairing() {
       display_unblank();
-      if (bt_state == BT_STATE_OFF) {
-        bt_state = BT_STATE_ON;
-        SerialBT.begin(bt_devname);
-        SerialBT.setTimeout(10);
-      }
+      bt_allow_pairing = false;
+      bt_ssp_pin = 0;
+      bt_state = BT_STATE_ON;
     }
 
-    void bt_stop() {
-      // Serial.println("BT stop");
-      display_unblank();
-      if (bt_state != BT_STATE_OFF) {
-        bt_allow_pairing = false;
-        bt_state = BT_STATE_OFF;
-        SerialBT.end();
-      }
+    void bt_passkey_notify_callback(uint32_t passkey) {
+      // Serial.printf("Got passkey notification: %d\n", passkey);
+      bt_ssp_pin = passkey;
+      bt_state = BT_STATE_PAIRING;
+      bt_allow_pairing = true;
+      bt_pairing_started = millis();
+      kiss_indicate_btpin();
     }
 
-    bool bt_init() {
-      // Serial.println("BT init");
-      bt_state = BT_STATE_OFF;
-      if (bt_setup_hw()) {
-        if (bt_enabled && !console_active) bt_start();
-        return true;
-      } else {
-        return false;
-      }
+    bool bt_confirm_pin_callback(uint32_t pin) {
+      // Serial.printf("Confirm PIN callback: %d\n", pin);
+      return true;
     }
 
     void bt_debond_all() {
@@ -217,44 +205,6 @@ char bt_devname[11];
       free(dev_list);
     }
 
-    void bt_enable_pairing() {
-      // Serial.println("BT enable pairing");
-      display_unblank();
-      if (bt_state == BT_STATE_OFF) bt_start();
-
-      bt_security_setup();
-
-      bt_allow_pairing = true;
-      bt_pairing_started = millis();
-      bt_state = BT_STATE_PAIRING;
-      bt_ssp_pin = pairing_pin;
-    }
-
-    void bt_disable_pairing() {
-      // Serial.println("BT disable pairing");
-      display_unblank();
-      bt_allow_pairing = false;
-      bt_ssp_pin = 0;
-      bt_state = BT_STATE_ON;
-    }
-
-    void bt_passkey_notify_callback(uint32_t passkey) {
-      // Serial.printf("Got passkey notification: %d\n", passkey);
-      if (bt_allow_pairing) {
-        bt_ssp_pin = passkey;
-        bt_pairing_started = millis();
-        kiss_indicate_btpin();
-      } else {
-        // Serial.println("Pairing not allowed, re-init");
-        SerialBT.disconnect();
-      }
-    }
-
-    bool bt_confirm_pin_callback(uint32_t pin) {
-      // Serial.printf("Confirm PIN callback: %d\n", pin);
-      return true;
-    }
-
     void bt_update_passkey() {
       // Serial.println("Updating passkey");
       pairing_pin = random(899999)+100000;
@@ -271,6 +221,31 @@ char bt_devname[11];
       return ble_authenticated;
     }
 
+    void bt_security_setup() {
+      uint32_t passkey = bt_passkey_callback();
+
+      // Serial.printf("Executing BT security setup, passkey is %d\n", passkey);
+
+      uint8_t key_size = 16;
+      uint8_t init_key = ESP_BLE_ENC_KEY_MASK | ESP_BLE_ID_KEY_MASK;
+      uint8_t rsp_key = ESP_BLE_ENC_KEY_MASK | ESP_BLE_ID_KEY_MASK;
+
+      esp_ble_auth_req_t auth_req = ESP_LE_AUTH_REQ_SC_MITM_BOND;
+      uint8_t auth_option = ESP_BLE_ONLY_ACCEPT_SPECIFIED_AUTH_ENABLE;
+      uint8_t oob_support = ESP_BLE_OOB_DISABLE;
+
+      esp_ble_io_cap_t iocap = ESP_IO_CAP_OUT;
+
+      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_STATIC_PASSKEY, &passkey, sizeof(uint32_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_AUTHEN_REQ_MODE, &auth_req, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_IOCAP_MODE, &iocap, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_MAX_KEY_SIZE, &key_size, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH, &auth_option, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_OOB_SUPPORT, &oob_support, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_INIT_KEY, &init_key, sizeof(uint8_t));
+      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_RSP_KEY, &rsp_key, sizeof(uint8_t));
+    }
+
     bool bt_security_request_callback() {
       if (bt_allow_pairing) {
           // Serial.println("Accepting security request");
@@ -285,15 +260,11 @@ char bt_devname[11];
       if (auth_result.success == true) {
         // Serial.println("Authentication success");
         ble_authenticated = true;
-        if (bt_state == BT_STATE_PAIRING) {
-          // Serial.println("Pairing complete, disconnecting");
-          delay(2000); SerialBT.disconnect();
-        } else { bt_state = BT_STATE_CONNECTED; }
+        bt_state = BT_STATE_CONNECTED;
       } else {
         // Serial.println("Authentication fail");
         ble_authenticated = false;
         bt_state = BT_STATE_ON;
-        bt_update_passkey();
         bt_security_setup();
       }
       bt_allow_pairing = false;
@@ -301,16 +272,16 @@ char bt_devname[11];
     }
 
     void bt_connect_callback(BLEServer *server) {
-      uint16_t conn_id = server->getConnId();
+      // uint16_t conn_id = server->getConnId();
       // Serial.printf("Connected: %d\n", conn_id);
       display_unblank();
       ble_authenticated = false;
-      if (bt_state != BT_STATE_PAIRING) { bt_state = BT_STATE_CONNECTED; }
+      bt_state = BT_STATE_CONNECTED;
       cable_state = CABLE_STATE_DISCONNECTED;
     }
 
     void bt_disconnect_callback(BLEServer *server) {
-      uint16_t conn_id = server->getConnId();
+      // uint16_t conn_id = server->getConnId();
       // Serial.printf("Disconnected: %d\n", conn_id);
       display_unblank();
       ble_authenticated = false;
@@ -318,7 +289,6 @@ char bt_devname[11];
     }
 
     bool bt_setup_hw() {
-      // Serial.println("BT setup hw");
       if (!bt_ready) {
         if (EEPROM.read(eeprom_addr(ADDR_CONF_BT)) == BT_ENABLE_BYTE) {
           bt_enabled = true;
@@ -350,30 +320,45 @@ char bt_devname[11];
       } else { return false; }
     }
 
-    void bt_security_setup() {
-      // Serial.println("Executing BT security setup");
-      if (pairing_pin == 0) { bt_update_passkey(); }
-      uint32_t passkey = pairing_pin;
-      // Serial.printf("Passkey is %d\n", passkey);
+    void bt_start() {
+      display_unblank();
+      if (bt_state == BT_STATE_OFF) {
+        bt_state = BT_STATE_ON;
+        SerialBT.begin(bt_devname);
+        SerialBT.setTimeout(10);
+      }
+    }
 
-      uint8_t key_size = 16;
-      uint8_t init_key = ESP_BLE_ENC_KEY_MASK | ESP_BLE_ID_KEY_MASK;
-      uint8_t rsp_key = ESP_BLE_ENC_KEY_MASK | ESP_BLE_ID_KEY_MASK;
+    void bt_stop() {
+      display_unblank();
+      if (bt_state != BT_STATE_OFF) {
+        bt_allow_pairing = false;
+        bt_state = BT_STATE_OFF;
+        SerialBT.end();
+      }
+    }
 
-      esp_ble_auth_req_t auth_req = ESP_LE_AUTH_REQ_SC_MITM_BOND;
-      uint8_t auth_option = ESP_BLE_ONLY_ACCEPT_SPECIFIED_AUTH_ENABLE;
-      uint8_t oob_support = ESP_BLE_OOB_DISABLE;
+    bool bt_init() {
+        bt_state = BT_STATE_OFF;
+        if (bt_setup_hw()) {
+          if (bt_enabled && !console_active) bt_start();
+          return true;
+        } else {
+          return false;
+        }
+    }
 
-      esp_ble_io_cap_t iocap = ESP_IO_CAP_OUT;
+    void bt_enable_pairing() {
+      display_unblank();
+      if (bt_state == BT_STATE_OFF) bt_start();
 
-      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_STATIC_PASSKEY, &passkey, sizeof(uint32_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_AUTHEN_REQ_MODE, &auth_req, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_IOCAP_MODE, &iocap, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_MAX_KEY_SIZE, &key_size, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_ONLY_ACCEPT_SPECIFIED_SEC_AUTH, &auth_option, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_OOB_SUPPORT, &oob_support, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_INIT_KEY, &init_key, sizeof(uint8_t));
-      esp_ble_gap_set_security_param(ESP_BLE_SM_SET_RSP_KEY, &rsp_key, sizeof(uint8_t));
+      bt_security_setup();
+      //bt_debond_all();
+      //bt_update_passkey();
+
+      bt_allow_pairing = true;
+      bt_pairing_started = millis();
+      bt_state = BT_STATE_PAIRING;
     }
 
     void update_bt() {
@@ -389,12 +374,9 @@ char bt_devname[11];
   #endif
 
 #elif MCU_VARIANT == MCU_NRF52
-    uint32_t pairing_pin = 0;
-
   uint8_t eeprom_read(uint32_t mapped_addr);
 
   void bt_stop() {
-    // Serial.println("BT Stop");
     if (bt_state != BT_STATE_OFF) {
       bt_allow_pairing = false;
       bt_state = BT_STATE_OFF;
@@ -404,19 +386,16 @@ char bt_devname[11];
   void bt_flush() { if (bt_state == BT_STATE_CONNECTED) { SerialBT.flushTXD(); } }
 
   void bt_disable_pairing() {
-    // Serial.println("BT Disable pairing");
     bt_allow_pairing = false;
-    pairing_pin = 0;
     bt_ssp_pin = 0;
     bt_state = BT_STATE_ON;
   }
 
   void bt_pairing_complete(uint16_t conn_handle, uint8_t auth_status) {
-    // Serial.println("BT pairing complete");
-    BLEConnection* connection = Bluefruit.Connection(conn_handle);
     if (auth_status == BLE_GAP_SEC_STATUS_SUCCESS) {
+      BLEConnection* connection = Bluefruit.Connection(conn_handle);
+
       ble_gap_conn_sec_mode_t security = connection->getSecureMode();
-      // Serial.println("Bonding success");
 
       // On the NRF52 it is not possible with the Arduino library to reject
       // requests from devices with no IO capabilities, which would allow
@@ -433,26 +412,26 @@ char bt_devname[11];
       // Requires investigation.
 
       if (security.sm == 1 && security.lv >= 3) {
-          // Serial.println("Auth level success");
           bt_state = BT_STATE_CONNECTED;
           cable_state = CABLE_STATE_DISCONNECTED;
-          connection->disconnect();
           bt_disable_pairing();
       } else {
-          // Serial.println("Auth level failure, debonding");
-          if (connection->bonded()) { connection->removeBondKey(); }
+          if (connection->bonded()) {
+              connection->removeBondKey();
+          }
           connection->disconnect();
-          bt_disable_pairing();
       }
     } else {
-      // Serial.println("Bonding failure");
-      connection->disconnect();
-      bt_disable_pairing();
+      bt_ssp_pin = 0;
     }
   }
 
   bool bt_passkey_callback(uint16_t conn_handle, uint8_t const passkey[6], bool match_request) {
-    // Serial.println("Passkey callback");
+    for (int i = 0; i < 6; i++) {
+      // multiply by tens however many times needed to make numbers appear in order
+      bt_ssp_pin += ((int)passkey[i] - 48) * pow(10, 5-i);
+    }
+    kiss_indicate_btpin();
     if (bt_allow_pairing) {
       return true;
     }
@@ -460,7 +439,6 @@ char bt_devname[11];
   }
 
   void bt_connect_callback(uint16_t conn_handle) {
-    // Serial.println("Connect callback");
     bt_state = BT_STATE_CONNECTED;
     cable_state = CABLE_STATE_DISCONNECTED;
 
@@ -471,26 +449,12 @@ char bt_devname[11];
   }
 
   void bt_disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-    // Serial.println("Disconnect callback");
     if (reason != BLE_GAP_SEC_STATUS_SUCCESS) {
         bt_state = BT_STATE_ON;
     }
   }
 
-  void bt_update_passkey() {
-    // Serial.println("Update passkey");
-    pairing_pin = random(899999)+100000;
-    bt_ssp_pin = pairing_pin;
-  }
-
-  uint32_t bt_get_passkey() {
-    // Serial.println("API passkey request");
-    if (pairing_pin == 0) { bt_update_passkey(); }
-    return pairing_pin;
-  }
-
   bool bt_setup_hw() {
-    // Serial.println("Setup HW");
     if (!bt_ready) {
       #if HAS_EEPROM 
           if (EEPROM.read(eeprom_addr(ADDR_CONF_BT)) == BT_ENABLE_BYTE) {
@@ -504,10 +468,6 @@ char bt_devname[11];
       Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
       Bluefruit.autoConnLed(false);
       if (Bluefruit.begin()) {
-        uint32_t pin = bt_get_passkey();
-        char pin_char[6];
-        sprintf(pin_char,"%lu", pin);
-
         Bluefruit.setTxPower(8);    // Check bluefruit.h for supported values
         Bluefruit.Security.setIOCaps(true, false, false); // display, yes; yes / no, no; keyboard, no
         // This device is indeed capable of yes / no through the pairing mode
@@ -517,7 +477,6 @@ char bt_devname[11];
         Bluefruit.Security.setMITM(true);
         Bluefruit.Security.setPairPasskeyCallback(bt_passkey_callback);
         Bluefruit.Security.setSecuredCallback(bt_connect_callback);
-        Bluefruit.Security.setPIN(pin_char);
         Bluefruit.Periph.setDisconnectCallback(bt_disconnect_callback);
         Bluefruit.Security.setPairCompleteCallback(bt_pairing_complete);
         Bluefruit.Periph.setConnInterval(6, 12); // 7.5 - 15 ms
@@ -545,24 +504,20 @@ char bt_devname[11];
   }
 
   void bt_start() {
-    // Serial.println("BT Start");
     if (bt_state == BT_STATE_OFF) {
       Bluefruit.setName(bt_devname);
       bledis.setManufacturer(BLE_MANUFACTURER);
       bledis.setModel(BLE_MODEL);
       // start device information service
       bledis.begin();
+
+      SerialBT.bufferTXD(true); // enable buffering
+
+      SerialBT.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM); // enable encryption for BLE serial
+      SerialBT.begin();
+
       blebas.begin();
 
-      // Guard to ensure SerialBT service is not duplicated through BT being power cycled
-      if (!SerialBT_init) {
-          SerialBT.bufferTXD(true); // enable buffering
-
-          SerialBT.setPermission(SECMODE_ENC_WITH_MITM, SECMODE_ENC_WITH_MITM); // enable encryption for BLE serial
-          SerialBT.begin();
-          SerialBT_init = true;
-      }
-
       Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
       Bluefruit.Advertising.addTxPower();
 
@@ -580,7 +535,6 @@ char bt_devname[11];
   }
 
   bool bt_init() {
-    // Serial.println("BT init");
     bt_state = BT_STATE_OFF;
     if (bt_setup_hw()) {
       if (bt_enabled && !console_active) bt_start();
@@ -591,22 +545,12 @@ char bt_devname[11];
   }
 
   void bt_enable_pairing() {
-    // Serial.println("BT enable pairing");
     if (bt_state == BT_STATE_OFF) bt_start();
-
-    uint32_t pin = bt_get_passkey();
-    char pin_char[6];
-    sprintf(pin_char,"%lu", pin);
-    Bluefruit.Security.setPIN(pin_char);
-
     bt_allow_pairing = true;
     bt_pairing_started = millis();
     bt_state = BT_STATE_PAIRING;
-    kiss_indicate_btpin();
   }
 
-  void bt_debond_all() { }
-
   void update_bt() {
     if (bt_allow_pairing && millis()-bt_pairing_started >= BT_PAIRING_TIMEOUT) {
       bt_disable_pairing();
diff --git a/Boards.h b/Boards.h
index 410afd3..adae722 100644
--- a/Boards.h
+++ b/Boards.h
@@ -65,11 +65,6 @@
   #define MODEL_DB            0xDB // LilyGO T-Beam Supreme, 433 MHz
   #define MODEL_DC            0xDC // LilyGO T-Beam Supreme, 868 MHz
 
-  #define PRODUCT_XIAO_S3     0xEB
-  #define BOARD_XIAO_S3       0x3E
-  #define MODEL_DE            0xDE // Xiao ESP32S3 with Wio-SX1262 module, 433 MHz
-  #define MODEL_DD            0xDD // Xiao ESP32S3 with Wio-SX1262 module, 868 MHz
-
   #define PRODUCT_T32_10      0xB2
   #define BOARD_LORA32_V1_0   0x39
   #define MODEL_BA            0xBA // LilyGO T3 v1.0, 433 MHz
@@ -598,46 +593,6 @@
         #endif
       #endif
 
-    #elif BOARD_MODEL == BOARD_XIAO_S3
-      #define IS_ESP32S3 true
-      #define MODEM SX1262
-      #define DIO2_AS_RF_SWITCH true
-      #define HAS_BUSY true
-      #define HAS_TCXO true
-
-      #define HAS_DISPLAY false
-      #define HAS_CONSOLE true
-      #define HAS_BLUETOOTH false
-      #define HAS_BLE true
-      #define HAS_NP false
-      #define HAS_SD false
-      #define HAS_EEPROM true
-
-      #define HAS_INPUT true
-      #define HAS_SLEEP true
-      #define PIN_WAKEUP GPIO_NUM_21
-      #define WAKEUP_LEVEL 0
-
-      const int pin_btn_usr1 = 21;
-      const int pin_cs = 41;
-      const int pin_reset = 42;
-      const int pin_sclk = 7;
-      const int pin_mosi = 9;
-      const int pin_miso = 8;
-      const int pin_tcxo_enable = -1;
-      const int pin_dio = 39;
-      const int pin_busy = 40;
-      
-      #if HAS_NP == false
-        #if defined(EXTERNAL_LEDS)
-          const int pin_led_rx = 48;
-          const int pin_led_tx = 48;
-        #else
-          const int pin_led_rx = 48;
-          const int pin_led_tx = 48;
-        #endif
-      #endif
-
     #else
       #error An unsupported ESP32 board was selected. Cannot compile RNode firmware.
     #endif
diff --git a/Config.h b/Config.h
index 9df3c47..d827b68 100644
--- a/Config.h
+++ b/Config.h
@@ -20,7 +20,7 @@
 	#define CONFIG_H
 
 	#define MAJ_VERS  0x01
-	#define MIN_VERS  0x52
+	#define MIN_VERS  0x51
 
 	#define MODE_HOST 0x11
 	#define MODE_TNC  0x12
diff --git a/Console/build.py b/Console/build.py
index a3a6b0b..2a641ad 100644
--- a/Console/build.py
+++ b/Console/build.py
@@ -4,9 +4,9 @@ import sys
 import shutil
 
 packages = {
-    "rns": "rns-0.9.1-py3-none-any.whl",
+    "rns": "rns-0.9.0-py3-none-any.whl",
     "nomadnet": "nomadnet-0.5.7-py3-none-any.whl",
-    "lxmf": "lxmf-0.6.0-py3-none-any.whl",
+    "lxmf": "lxmf-0.5.9-py3-none-any.whl",
     "rnsh": "rnsh-0.1.5-py3-none-any.whl",
 }
 
diff --git a/Display.h b/Display.h
index c42283c..862a2e5 100644
--- a/Display.h
+++ b/Display.h
@@ -85,12 +85,6 @@
   #define SCL_OLED 18
   #define SDA_OLED 17
   #define DISP_CUSTOM_ADDR false
-#elif BOARD_MODEL == BOARD_XIAO_S3
-  #define DISP_RST -1
-  #define DISP_ADDR 0x3C
-  #define SCL_OLED 6
-  #define SDA_OLED 5
-  #define DISP_CUSTOM_ADDR true
 #else
   #define DISP_RST -1
   #define DISP_ADDR 0x3C
@@ -284,8 +278,6 @@ bool display_init() {
       #endif
     #elif BOARD_MODEL == BOARD_TBEAM_S_V1
       Wire.begin(SDA_OLED, SCL_OLED);
-    #elif BOARD_MODEL == BOARD_XIAO_S3
-      Wire.begin(SDA_OLED, SCL_OLED);
     #endif
 
     #if HAS_EEPROM
@@ -617,7 +609,7 @@ void draw_quality_bars(int px, int py) {
   }
 }
 
-#if MODEM == SX1280
+#if MODE == SX1280
   #define S_RSSI_MIN -105.0
   #define S_RSSI_MAX -65.0
 #else
@@ -663,7 +655,7 @@ void draw_waterfall(int px, int py) {
   if (rssi_val > WF_RSSI_MAX) rssi_val = WF_RSSI_MAX;
   int rssi_normalised = ((rssi_val - WF_RSSI_MIN)*(1.0/WF_RSSI_SPAN))*WF_PIXEL_WIDTH;
   if (display_tx) {
-    for (uint8_t i = 0; i < WF_TX_SIZE; i++) {
+    for (uint8_t i; i < WF_TX_SIZE; i++) {
       waterfall[waterfall_head++] = -1;
       if (waterfall_head >= WATERFALL_SIZE) waterfall_head = 0;
     }
diff --git a/Framing.h b/Framing.h
index 9346f70..89e1039 100644
--- a/Framing.h
+++ b/Framing.h
@@ -61,7 +61,6 @@
   #define CMD_DISP_RCND   0x68
   #define CMD_NP_INT      0x65
   #define CMD_BT_CTRL     0x46
-  #define CMD_BT_UNPAIR   0x70
   #define CMD_BT_PIN      0x62
   #define CMD_DIS_IA      0x69
 
@@ -83,11 +82,6 @@
   #define CMD_RESET       0x55
   #define CMD_RESET_BYTE  0xF8
 
-  #define CMD_LOG         0x80
-  #define CMD_TIME        0x81
-  #define CMD_MUX_CHAIN   0x82
-  #define CMD_MUX_DSCVR   0x83
-
   #define DETECT_REQ      0x73
   #define DETECT_RESP     0x46
 
diff --git a/Makefile b/Makefile
index b6f5a7b..2a244ac 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@
 # Version 2.0.17 of the Arduino ESP core is based on ESP-IDF v4.4.7
 ARDUINO_ESP_CORE_VER = 2.0.17
 
-# Version 3.2.0 of the Arduino ESP core is based on ESP-IDF v5.4.1
-# ARDUINO_ESP_CORE_VER = 3.2.0
-
 all: release
 
 clean:
@@ -146,9 +143,6 @@ firmware-heltec_t114:
 firmware-techo:
 	arduino-cli compile --log --fqbn adafruit:nrf52:pca10056 -e --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\""
 
-firmware-xiao_s3:
-	arduino-cli compile --log --fqbn "esp32:esp32:XIAO_ESP32S3" -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3E\""
-
 upload:
 	arduino-cli upload -p /dev/ttyUSB0 --fqbn unsignedio:avr:rnode
 
@@ -198,11 +192,11 @@ upload-heltec32_v2:
 	python ./Release/esptool/esptool.py --chip esp32 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
 
 upload-heltec32_v3:
-	arduino-cli upload -p /dev/ttyUSB0 --fqbn esp32:esp32:heltec_wifi_lora_32_V3
+	arduino-cli upload -p /dev/ttyUSB1 --fqbn esp32:esp32:heltec_wifi_lora_32_V3
 	@sleep 1
-	rnodeconf /dev/ttyUSB0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.heltec_wifi_lora_32_V3/RNode_Firmware.ino.bin)
+	rnodeconf /dev/ttyUSB1 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.heltec_wifi_lora_32_V3/RNode_Firmware.ino.bin)
 	@sleep 3
-	python ./Release/esptool/esptool.py --chip esp32-s3 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
+	python ./Release/esptool/esptool.py --chip esp32-s3 --port /dev/ttyUSB1 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
 
 upload-tdeck:
 	arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:esp32s3
@@ -261,16 +255,9 @@ upload-techo:
 	@sleep 6
 	rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes from_device /dev/ttyACM0)
 
-upload-xiao_s3:
-	arduino-cli upload -p /dev/ttyACM0 --fqbn esp32:esp32:XIAO_ESP32S3
-	@sleep 1
-	rnodeconf /dev/ttyACM0 --firmware-hash $$(./partition_hashes ./build/esp32.esp32.XIAO_ESP32S3/RNode_Firmware.ino.bin)
-	@sleep 3
-	python ./Release/esptool/esptool.py --chip esp32s3 --port /dev/ttyACM0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size 4MB 0x210000 ./Release/console_image.bin
-
 release: release-all
 
-release-all: release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-heltec_t114 release-techo release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-xiao_s3 release-hashes
+release-all: console-site spiffs-image release-tbeam release-tbeam_sx1262 release-lora32_v10 release-lora32_v20 release-lora32_v21 release-lora32_v10_extled release-lora32_v20_extled release-lora32_v21_extled release-lora32_v21_tcxo release-featheresp32 release-genericesp32 release-heltec32_v2 release-heltec32_v3 release-heltec32_v2_extled release-heltec_t114 release-techo release-rnode_ng_20 release-rnode_ng_21 release-t3s3 release-t3s3_sx127x release-t3s3_sx1280_pa release-tdeck release-tbeam_supreme release-rak4631 release-hashes
 
 release-hashes:
 	python ./release_hashes.py > ./Release/release.json
@@ -370,7 +357,7 @@ release-heltec32_v2: check_bt_buffers
 	zip --junk-paths ./Release/rnode_firmware_heltec32v2.zip ./Release/esptool/esptool.py ./Release/console_image.bin build/rnode_firmware_heltec32v2.boot_app0 build/rnode_firmware_heltec32v2.bin build/rnode_firmware_heltec32v2.bootloader build/rnode_firmware_heltec32v2.partitions
 	rm -r build
 
-release-heltec32_v3: check_bt_buffers
+release-heltec32_v3:
 	arduino-cli compile --fqbn esp32:esp32:heltec_wifi_lora_32_V3 -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3A\""
 	cp ~/.arduino15/packages/esp32/hardware/esp32/$(ARDUINO_ESP_CORE_VER)/tools/partitions/boot_app0.bin build/rnode_firmware_heltec32v3.boot_app0
 	cp build/esp32.esp32.heltec_wifi_lora_32_V3/RNode_Firmware.ino.bin build/rnode_firmware_heltec32v3.bin
@@ -488,12 +475,3 @@ release-techo:
 	arduino-cli compile --log --fqbn adafruit:nrf52:pca10056 -e --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x44\""
 	cp build/adafruit.nrf52.pca10056/RNode_Firmware.ino.hex build/rnode_firmware_techo.hex
 	adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application build/rnode_firmware_techo.hex Release/rnode_firmware_techo.zip
-
-release-xiao_s3:
-	arduino-cli compile --fqbn "esp32:esp32:XIAO_ESP32S3" -e --build-property "build.partitions=no_ota" --build-property "upload.maximum_size=2097152" --build-property "compiler.cpp.extra_flags=\"-DBOARD_MODEL=0x3E\""
-	cp ~/.arduino15/packages/esp32/hardware/esp32/$(ARDUINO_ESP_CORE_VER)/tools/partitions/boot_app0.bin build/rnode_firmware_xiao_esp32s3.boot_app0
-	cp build/esp32.esp32.XIAO_ESP32S3/RNode_Firmware.ino.bin build/rnode_firmware_xiao_esp32s3.bin
-	cp build/esp32.esp32.XIAO_ESP32S3/RNode_Firmware.ino.bootloader.bin build/rnode_firmware_xiao_esp32s3.bootloader
-	cp build/esp32.esp32.XIAO_ESP32S3/RNode_Firmware.ino.partitions.bin build/rnode_firmware_xiao_esp32s3.partitions
-	zip --junk-paths ./Release/rnode_firmware_xiao_esp32s3.zip ./Release/esptool/esptool.py ./Release/console_image.bin build/rnode_firmware_xiao_esp32s3.boot_app0 build/rnode_firmware_xiao_esp32s3.bin build/rnode_firmware_xiao_esp32s3.bootloader build/rnode_firmware_xiao_esp32s3.partitions
-	rm -r build
\ No newline at end of file
diff --git a/Power.h b/Power.h
index d6af640..3ab6e10 100644
--- a/Power.h
+++ b/Power.h
@@ -232,10 +232,6 @@ void measure_battery() {
         }
       }
 
-      #if MCU_VARIANT == MCU_NRF52
-        if (bt_state != BT_STATE_OFF) { blebas.write(battery_percent); }
-      #endif
-
       // if (bt_state == BT_STATE_CONNECTED) {
       //   SerialBT.printf("Bus voltage %.3fv. Unfiltered %.3fv.", battery_voltage, bat_v_samples[BAT_SAMPLES-1]);
       //   if (bat_voltage_dropping) { SerialBT.printf(" Voltage is dropping. Percentage %.1f%%.", battery_percent); }
diff --git a/README.md b/README.md
index d6cf721..12ffa87 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The RNode system is primarily software, which *transforms* different kinds of av
 
 ## Latest Release
 
-The latest release, installable through `rnodeconf`, is version `1.82`. You must have at least version `2.4.1` of `rnodeconf` installed to update the RNode Firmware to version `1.82`. Get it by updating the `rns` package to at least version `0.9.4`.
+The latest release, installable through `rnodeconf`, is version `1.81`. You must have at least version `2.4.0` of `rnodeconf` installed to update the RNode Firmware to version `1.81`. Get it by updating the `rns` package to at least version `0.9.0`.
 
 ## A Self-Replicating System
 
@@ -72,19 +72,19 @@ The RNode Firmware supports the following boards:
 - LilyGO T3S3 devices with SX1276/8 LoRa chips
 - LilyGO T3S3 devices with SX1262/8 LoRa chips
 - LilyGO T3S3 devices with SX1280 LoRa chips
-- LilyGO T-Echo devices
 - Heltec LoRa32 v2 devices
 - Heltec LoRa32 v3 devices
 - Heltec T114 devices
 - RAK4631 devices
-- SeeedStudio XIAO ESP32S3 devices (with Wio-SX1262)
 - Homebrew RNodes based on ATmega1284p boards
 - Homebrew RNodes based on ATmega2560 boards
 - Homebrew RNodes based on Adafruit Feather ESP32 boards
 - Homebrew RNodes based on generic ESP32 boards
 
 ## Supported Transceiver Modules
-The RNode Firmware supports all transceiver modules based on Semtech **SX1276**, **SX1278**, **SX1262**, **SX1268** and **SX1280** chips, that have an **SPI interface** and expose the relevant **DIO** interrupt pins from the chip.
+The RNode Firmware supports all transceiver modules based on **Semtech SX1276** or **Semtech SX1278** chips, that have an **SPI interface** and expose the **DIO_0** interrupt pin from the chip.
+
+Support for **SX1262**, **SX1268** and **SX1280** is being implemented. Please support the project with donations if you want this faster!
 
 ## Getting Started Fast
 You can download and flash the firmware to all the supported boards using the [RNode Config Utility](https://github.com/markqvist/rnodeconfigutil). All firmware releases are now handled and installed directly through the `rnodeconf` utility, which is included in the `rns` package. It can be installed via `pip`:
@@ -120,17 +120,16 @@ You can help support the continued development of open, free and private communi
   ```
   84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w
   ```
-- Bitcoin
-  ```
-  bc1p4a6axuvl7n9hpapfj8sv5reqj8kz6uxa67d5en70vzrttj0fmcusgxsfk5
-  ```
 - Ethereum
   ```
-  0xae89F3B94fC4AD6563F0864a55F9a697a90261ff
+  0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73
+  ```
+- Bitcoin
+  ```
+  35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH
   ```
 - Ko-Fi: https://ko-fi.com/markqvist
 
-
 ## License & Use
 The RNode Firmware is Copyright © 2024 Mark Qvist / [unsigned.io](https://unsigned.io), and is made available under the **GNU General Public License v3.0**. The source code includes an SX1276 driver that is released under MIT License, and Copyright © 2018 Sandeep Mistry / Mark Qvist.
 
diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index d2437f1..c2b9886 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -94,24 +94,14 @@ void setup() {
   #endif
 
   // Seed the PRNG for CSMA R-value selection
-  #if MCU_VARIANT == MCU_ESP32
+  # if MCU_VARIANT == MCU_ESP32
     // On ESP32, get the seed value from the
     // hardware RNG
-    unsigned long seed_val = (unsigned long)esp_random();
-  #elif MCU_VARIANT == MCU_NRF52
-    // On nRF, get the seed value from the
-    // hardware RNG
-    unsigned long seed_val = get_rng_seed();
+    int seed_val = (int)esp_random();
   #else
     // Otherwise, get a pseudo-random seed
     // value from an unconnected analog pin
-    //
-    // CAUTION! If you are implementing the
-    // firmware on a platform that does not
-    // have a hardware RNG, you MUST take
-    // care to get a seed value with enough
-    // entropy at each device reset!
-    unsigned long seed_val = analogRead(0);
+    int seed_val = analogRead(0);
   #endif
   randomSeed(seed_val);
 
@@ -125,10 +115,6 @@ void setup() {
     led_init();
   #endif
 
-  #if MCU_VARIANT == MCU_NRF52 && HAS_NP == true
-    boot_seq();
-  #endif
-
   #if BOARD_MODEL != BOARD_RAK4631 && BOARD_MODEL != BOARD_HELTEC_T114 && BOARD_MODEL != BOARD_TECHO && BOARD_MODEL != BOARD_T3S3 && BOARD_MODEL != BOARD_TBEAM_S_V1
     // Some boards need to wait until the hardware UART is set up before booting
     // the full firmware. In the case of the RAK4631 and Heltec T114, the line below will wait
@@ -193,13 +179,6 @@ void setup() {
       #endif
     #endif
 
-    #if BOARD_MODEL == BOARD_XIAO_S3
-      // Improve wakeup from sleep
-      delay(300);
-      LoRa->reset();
-      delay(100);
-    #endif
-
     // Check installed transceiver chip and
     // probe boot parameters.
     if (LoRa->preInit()) {
@@ -1148,10 +1127,6 @@ void serial_callback(uint8_t sbyte) {
           }
         }
       #endif
-    } else if (command == CMD_BT_UNPAIR) {
-      #if HAS_BLE
-        if (sbyte == 0x01) { bt_debond_all(); }
-      #endif
     } else if (command == CMD_DISP_INT) {
       #if HAS_DISPLAY
         if (sbyte == FESC) {
@@ -1636,13 +1611,10 @@ void loop() {
 
 void sleep_now() {
   #if HAS_SLEEP == true
-    stopRadio(); // TODO: Check this on all platforms
     #if PLATFORM == PLATFORM_ESP32
-      #if BOARD_MODEL == BOARD_T3S3 || BOARD_MODEL == BOARD_XIAO_S3
-        #if HAS_DISPLAY
-          display_intensity = 0;
-          update_display(true);
-        #endif
+      #if BOARD_MODEL == BOARD_T3S3
+        display_intensity = 0;
+        update_display(true);
       #endif
       #if PIN_DISP_SLEEP >= 0
         pinMode(PIN_DISP_SLEEP, OUTPUT);
diff --git a/Utilities.h b/Utilities.h
index cfd523c..e08461f 100644
--- a/Utilities.h
+++ b/Utilities.h
@@ -18,7 +18,6 @@
 #if HAS_EEPROM
     #include <EEPROM.h>
 #elif PLATFORM == PLATFORM_NRF52
-		#include <hal/nrf_rng.h>
     #include <Adafruit_LittleFS.h>
     #include <InternalFileSystem.h>
     using namespace Adafruit_LittleFS_Namespace;
@@ -104,28 +103,6 @@ uint8_t boot_vector = 0x00;
 	// TODO: Get NRF52 boot flags
 #endif
 
-#if MCU_VARIANT == MCU_NRF52
-	unsigned long get_rng_seed() {
-		nrf_rng_error_correction_enable(NRF_RNG);
-		nrf_rng_shorts_disable(NRF_RNG, NRF_RNG_SHORT_VALRDY_STOP_MASK);
-		nrf_rng_task_trigger(NRF_RNG, NRF_RNG_TASK_START);
-		while (!nrf_rng_event_check(NRF_RNG, NRF_RNG_EVENT_VALRDY));
-		uint8_t rb_a = nrf_rng_random_value_get(NRF_RNG);
-		nrf_rng_event_clear(NRF_RNG, NRF_RNG_EVENT_VALRDY);
-		while (!nrf_rng_event_check(NRF_RNG, NRF_RNG_EVENT_VALRDY));
-		uint8_t rb_b = nrf_rng_random_value_get(NRF_RNG);
-		nrf_rng_event_clear(NRF_RNG, NRF_RNG_EVENT_VALRDY);
-		while (!nrf_rng_event_check(NRF_RNG, NRF_RNG_EVENT_VALRDY));
-		uint8_t rb_c = nrf_rng_random_value_get(NRF_RNG);
-		nrf_rng_event_clear(NRF_RNG, NRF_RNG_EVENT_VALRDY);
-		while (!nrf_rng_event_check(NRF_RNG, NRF_RNG_EVENT_VALRDY));
-		uint8_t rb_d = nrf_rng_random_value_get(NRF_RNG);
-		nrf_rng_event_clear(NRF_RNG, NRF_RNG_EVENT_VALRDY);
-		nrf_rng_task_trigger(NRF_RNG, NRF_RNG_TASK_STOP);
-		return rb_a << 24 | rb_b << 16 | rb_c << 8 | rb_d;
-	}
-#endif
-
 #if HAS_NP == true
 	#include <Adafruit_NeoPixel.h>
 	#define NUMPIXELS 1
@@ -308,13 +285,6 @@ uint8_t boot_vector = 0x00;
 		void led_tx_off() { digitalWrite(pin_led_tx, LOW); }
 		void led_id_on()  { }
 		void led_id_off() { }
-  #elif BOARD_MODEL == BOARD_XIAO_S3
-		void led_rx_on()  { digitalWrite(pin_led_rx, LED_ON); }
-		void led_rx_off() { digitalWrite(pin_led_rx, LED_OFF); }
-		void led_tx_on()  { digitalWrite(pin_led_tx, LED_ON); }
-		void led_tx_off() { digitalWrite(pin_led_tx, LED_OFF); }
-		void led_id_on()  { }
-		void led_id_off() { }
 	#elif BOARD_MODEL == BOARD_HUZZAH32
 		void led_rx_on()  { digitalWrite(pin_led_rx, HIGH); }
 		void led_rx_off() {	digitalWrite(pin_led_rx, LOW); }
@@ -372,7 +342,7 @@ void hard_reset(void) {
 	#elif MCU_VARIANT == MCU_ESP32
 		ESP.restart();
 	#elif MCU_VARIANT == MCU_NRF52
-    NVIC_SystemReset();
+        NVIC_SystemReset();
 	#endif
 }
 
@@ -1294,9 +1264,6 @@ void setTXPower() {
 		if (model == MODEL_DB) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
 		if (model == MODEL_DC) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
 
-		if (model == MODEL_DD) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
-		if (model == MODEL_DE) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
-
 		if (model == MODEL_E4) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
 		if (model == MODEL_E9) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
 		if (model == MODEL_E3) LoRa->setTxPower(lora_txp, PA_OUTPUT_PA_BOOST_PIN);
@@ -1500,7 +1467,7 @@ bool eeprom_product_valid() {
 	#if PLATFORM == PLATFORM_AVR
 	if (rval == PRODUCT_RNODE || rval == PRODUCT_HMBRW) {
 	#elif PLATFORM == PLATFORM_ESP32
-	if (rval == PRODUCT_RNODE || rval == BOARD_RNODE_NG_20 || rval == BOARD_RNODE_NG_21 || rval == PRODUCT_HMBRW || rval == PRODUCT_TBEAM || rval == PRODUCT_T32_10 || rval == PRODUCT_T32_20 || rval == PRODUCT_T32_21 || rval == PRODUCT_H32_V2 || rval == PRODUCT_H32_V3 || rval == PRODUCT_TDECK_V1 || rval == PRODUCT_TBEAM_S_V1  || rval == PRODUCT_XIAO_S3) {
+	if (rval == PRODUCT_RNODE || rval == BOARD_RNODE_NG_20 || rval == BOARD_RNODE_NG_21 || rval == PRODUCT_HMBRW || rval == PRODUCT_TBEAM || rval == PRODUCT_T32_10 || rval == PRODUCT_T32_20 || rval == PRODUCT_T32_21 || rval == PRODUCT_H32_V2 || rval == PRODUCT_H32_V3 || rval == PRODUCT_TDECK_V1 || rval == PRODUCT_TBEAM_S_V1) {
 	#elif PLATFORM == PLATFORM_NRF52
 	if (rval == PRODUCT_RAK4631 || rval == PRODUCT_HELTEC_T114 || rval == PRODUCT_TECHO || rval == PRODUCT_HMBRW) {
 	#else
@@ -1536,8 +1503,6 @@ bool eeprom_model_valid() {
 	if (model == MODEL_16 || model == MODEL_17) {
 	#elif BOARD_MODEL == BOARD_TBEAM_S_V1
 	if (model == MODEL_DB || model == MODEL_DC) {
-	#elif BOARD_MODEL == BOARD_XIAO_S3
-	if (model == MODEL_DD || model == MODEL_DE) {
 	#elif BOARD_MODEL == BOARD_LORA32_V1_0
 	if (model == MODEL_BA || model == MODEL_BB) {
 	#elif BOARD_MODEL == BOARD_LORA32_V2_0
diff --git a/esp32_btbufs.py b/esp32_btbufs.py
index ad0ae70..8a5b15e 100755
--- a/esp32_btbufs.py
+++ b/esp32_btbufs.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import sys
-import re
 
 try:
     target_path = sys.argv[1]
@@ -13,7 +12,7 @@ try:
         for line in sf:
             line_index += 1
             if line.startswith("#define RX_QUEUE_SIZE"):
-                ents = re.sub(" +", " ", line).split(" ")
+                ents = line.split(" ")
                 try:
                     rxbuf_size = int(ents[2])
                     rx_line_index = line_index
@@ -21,12 +20,12 @@ try:
                     print(f"Could not parse Bluetooth RX_QUEUE_SIZE: {e}")
 
             if line.startswith("#define TX_QUEUE_SIZE"):
-                ents = re.sub(" +", " ", line).split(" ")
+                ents = line.split(" ")
                 try:
                     txbuf_size = int(ents[2])
                     tx_line_index = line_index
                 except Exception as e:
-                    print(f"Could not parse Bluetooth TX_QUEUE_SIZE: {e}")
+                    print(f"Could not parse Bluetooth RX_QUEUE_SIZE: {e}")
 
             if rxbuf_size != 0 and txbuf_size != 0:
                 break
diff --git a/sx126x.cpp b/sx126x.cpp
index 30c22d9..4c06862 100644
--- a/sx126x.cpp
+++ b/sx126x.cpp
@@ -125,7 +125,7 @@ bool sx126x::preInit() {
   pinMode(_ss, OUTPUT);
   digitalWrite(_ss, HIGH);
   
-  #if BOARD_MODEL == BOARD_T3S3 || BOARD_MODEL == BOARD_HELTEC32_V3 || BOARD_MODEL == BOARD_TDECK || BOARD_MODEL == BOARD_XIAO_S3
+  #if BOARD_MODEL == BOARD_T3S3 || BOARD_MODEL == BOARD_HELTEC32_V3 || BOARD_MODEL == BOARD_TDECK
     SPI.begin(pin_sclk, pin_miso, pin_mosi, pin_cs);
   #elif BOARD_MODEL == BOARD_TECHO
     SPI.setPins(pin_miso, pin_sclk, pin_mosi);
@@ -570,7 +570,7 @@ void sx126x::sleep() { uint8_t byte = 0x00; executeOpcode(OP_SLEEP_6X, &byte, 1)
 
 void sx126x::enableTCXO() {
   #if HAS_TCXO
-    #if BOARD_MODEL == BOARD_RAK4631 || BOARD_MODEL == BOARD_HELTEC32_V3 || BOARD_MODEL == BOARD_XIAO_S3
+    #if BOARD_MODEL == BOARD_RAK4631 || BOARD_MODEL == BOARD_HELTEC32_V3
       uint8_t buf[4] = {MODE_TCXO_3_3V_6X, 0x00, 0x00, 0xFF};
     #elif BOARD_MODEL == BOARD_TBEAM
       uint8_t buf[4] = {MODE_TCXO_1_8V_6X, 0x00, 0x00, 0xFF};
diff --git a/sx126x.h b/sx126x.h
index 068a1bb..1703a8f 100644
--- a/sx126x.h
+++ b/sx126x.h
@@ -56,7 +56,6 @@ public:
   void receive(int size = 0);
   void standby();
   void sleep();
-  void reset(void);
 
   bool preInit();
   uint8_t getTxPower();
@@ -112,6 +111,7 @@ private:
   void handleLowDataRate();
   void optimizeModemSensitivity();
 
+  void reset(void);
   void calibrate(void);
   void calibrate_image(long frequency);