diff --git a/bin/Meshtastic_nRF52_factory_erase_v3_S140_7.3.0.uf2 b/bin/Meshtastic_nRF52_factory_erase_v3_S140_7.3.0.uf2
new file mode 100644
index 000000000..73537a735
Binary files /dev/null and b/bin/Meshtastic_nRF52_factory_erase_v3_S140_7.3.0.uf2 differ
diff --git a/src/mesh/LR11x0Interface.cpp b/src/mesh/LR11x0Interface.cpp
index 13b32533e..ecd222c48 100644
--- a/src/mesh/LR11x0Interface.cpp
+++ b/src/mesh/LR11x0Interface.cpp
@@ -100,13 +100,13 @@ template <typename T> bool LR11x0Interface<T>::init()
     // FIXME: May want to set depending on a definition, currently all LR1110 variant files use the DC-DC regulator option
     if (res == RADIOLIB_ERR_NONE)
         res = lora.setRegulatorDCDC();
-#ifdef TRACKER_T1000_E
-#ifdef LR11X0_DIO_RF_SWITCH_CONFIG
-    res = lora.setDioAsRfSwitch(LR11X0_DIO_RF_SWITCH_CONFIG);
-#else
-    res = lora.setDioAsRfSwitch(0x03, 0x0, 0x01, 0x03, 0x02, 0x0, 0x0, 0x0);
-#endif
-#endif
+// #ifdef TRACKER_T1000_E
+// #ifdef LR11X0_DIO_RF_SWITCH_CONFIG
+//     res = lora.setDioAsRfSwitch(LR11X0_DIO_RF_SWITCH_CONFIG);
+// #else
+//     res = lora.setDioAsRfSwitch(0x03, 0x0, 0x01, 0x03, 0x02, 0x0, 0x0, 0x0);
+// #endif
+// #endif
     if (res == RADIOLIB_ERR_NONE) {
         if (config.lora.sx126x_rx_boosted_gain) { // the name is unfortunate but historically accurate
             res = lora.setRxBoostedGainMode(true);
diff --git a/src/meshUtils.cpp b/src/meshUtils.cpp
index 99fcd2a57..c6f2c69b4 100644
--- a/src/meshUtils.cpp
+++ b/src/meshUtils.cpp
@@ -68,7 +68,7 @@ void printBytes(const char *label, const uint8_t *p, size_t numbytes)
 
 bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes)
 {
-    for (int i = 0; i < numbytes; i++) {
+    for (uint8_t i = 0; i < numbytes; i++) {
         if (mem[i] != find)
             return false;
     }
diff --git a/variants/tracker-t1000-e/platformio.ini b/variants/tracker-t1000-e/platformio.ini
index 1db57ca29..dfc72f3f0 100644
--- a/variants/tracker-t1000-e/platformio.ini
+++ b/variants/tracker-t1000-e/platformio.ini
@@ -4,7 +4,7 @@ extends = nrf52840_base
 board = tracker-t1000-e
 ; board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
-build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DTRACKER_T1000_E  -DRADIOLIB_GODMODE
+build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DTRACKER_T1000_E
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
diff --git a/variants/tracker-t1000-e/variant.h b/variants/tracker-t1000-e/variant.h
index 63c2a76dc..470edd08c 100644
--- a/variants/tracker-t1000-e/variant.h
+++ b/variants/tracker-t1000-e/variant.h
@@ -102,7 +102,6 @@ extern "C" {
 
 #define LR11X0_DIO3_TCXO_VOLTAGE 1.6
 #define LR11X0_DIO_AS_RF_SWITCH
-#define LR11X0_DIO_RF_SWITCH_CONFIG 0x0f, 0x0, 0x09, 0x0B, 0x0A, 0x0, 0x4, 0x0
 
 #define HAS_GPS 1
 #define GNSS_AIROHA