diff --git a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
index 027ab41d5..ea14d1a21 100644
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -1,6 +1,7 @@
 [env:pca10059_diy_eink]
 extends = nrf52840_base
 board = nordic_pca10059
+board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
diff --git a/variants/betafpv_2400_tx_micro/platformio.ini b/variants/betafpv_2400_tx_micro/platformio.ini
index e04f4efc2..decdb390e 100644
--- a/variants/betafpv_2400_tx_micro/platformio.ini
+++ b/variants/betafpv_2400_tx_micro/platformio.ini
@@ -1,6 +1,7 @@
 [env:betafpv_2400_tx_micro]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 build_flags =
   ${esp32_base.build_flags}
   -D BETAFPV_2400_TX
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index 9a2b5d467..d50d0c4f3 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -2,6 +2,7 @@
 [env:meshtastic-diy-v1]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
@@ -13,6 +14,7 @@ build_flags =
 [env:meshtastic-diy-v1.1]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
@@ -24,6 +26,7 @@ build_flags =
 [env:meshtastic-dr-dev]
 extends = esp32_base
 board = esp32doit-devkit-v1
+board_level = extra
 board_upload.maximum_size = 4194304
 board_upload.maximum_ram_size = 532480
 build_flags =
diff --git a/variants/feather_diy/platformio.ini b/variants/feather_diy/platformio.ini
index 84c582ab0..9b4806343 100644
--- a/variants/feather_diy/platformio.ini
+++ b/variants/feather_diy/platformio.ini
@@ -2,6 +2,7 @@
 [env:feather_diy]
 extends = nrf52840_base
 board = adafruit_feather_nrf52840
+board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
 lib_deps = 
diff --git a/variants/genieblocks/platformio.ini b/variants/genieblocks/platformio.ini
deleted file mode 100644
index b1d32277a..000000000
--- a/variants/genieblocks/platformio.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; The GenieBlocks LORA prototype board
-; note: @geeksville disabled because genieblocks_lora is not checked into the boards directory, please send in a PR to add it ;-)
-;[env:genieblocks_lora]
-;extends = esp32_base
-;board = genieblocks_lora
-;build_flags = 
-;  ${esp32_base.build_flags} -D GENIEBLOCKS -Ivariants/genieblocks
\ No newline at end of file
diff --git a/variants/genieblocks/variant.h b/variants/genieblocks/variant.h
deleted file mode 100644
index 0e51e3a9e..000000000
--- a/variants/genieblocks/variant.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
-#define GPS_RX_PIN 5
-#define GPS_TX_PIN 18
-#define GPS_RESET_N 10
-#define GPS_EXTINT 23 // On MAX-M8 module pin name is EXTINT. On L70 module pin name is STANDBY.
-
-#define BATTERY_PIN 39    // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define BATTERY_EN_PIN 14 // Voltage voltage divider enable pin connected to mosfet
-
-#define I2C_SDA 4 // I2C pins for this board
-#define I2C_SCL 2
-
-#define LED_PIN 12 // If defined we will blink this LED
-//#define BUTTON_PIN 36  // If defined, this will be used for user button presses (ToDo problem on that line on debug screen -->
-// Long press start!) #define BUTTON_NEED_PULLUP //GPIOs 34 to 39 are GPIs – input only pins. These pins don’t have internal
-// pull-ups or pull-down resistors.
-
-#define USE_RF95
-#define LORA_DIO0 38 // a No connect on the SX1262 module
-#define LORA_RESET 9
-
-#define RF95_SCK 22
-#define RF95_MISO 19
-#define RF95_MOSI 13
-#define RF95_NSS 21
\ No newline at end of file
diff --git a/variants/heltec_v1/platformio.ini b/variants/heltec_v1/platformio.ini
index 1ed6dff84..ee10ef0f6 100644
--- a/variants/heltec_v1/platformio.ini
+++ b/variants/heltec_v1/platformio.ini
@@ -1,6 +1,7 @@
 [env:heltec-v1]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
+board_level = extra
 board = heltec_wifi_lora_32
 build_flags = 
   ${esp32_base.build_flags} -D HELTEC_V1 -I variants/heltec_v1
\ No newline at end of file
diff --git a/variants/heltec_v2.1/platformio.ini b/variants/heltec_v2.1/platformio.ini
index 5fb4c8c32..792a1bb94 100644
--- a/variants/heltec_v2.1/platformio.ini
+++ b/variants/heltec_v2.1/platformio.ini
@@ -2,5 +2,6 @@
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags} -D HELTEC_V2_1 -I variants/heltec_v2.1
\ No newline at end of file
diff --git a/variants/heltec_v2/platformio.ini b/variants/heltec_v2/platformio.ini
index 6211437f0..8a60942a9 100644
--- a/variants/heltec_v2/platformio.ini
+++ b/variants/heltec_v2/platformio.ini
@@ -2,5 +2,6 @@
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags} -D HELTEC_V2_0 -I variants/heltec_v2
\ No newline at end of file
diff --git a/variants/lora_isp4520/platformio.ini b/variants/lora_isp4520/platformio.ini
index fb9fdf913..9d6563515 100644
--- a/variants/lora_isp4520/platformio.ini
+++ b/variants/lora_isp4520/platformio.ini
@@ -1,6 +1,7 @@
 [env:lora_isp4520]
 extends = nrf52_base
 board = lora_isp4520
+board_level = extra
 
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/lora_isp4520
diff --git a/variants/lora_relay_v1/platformio.ini b/variants/lora_relay_v1/platformio.ini
index 9a73fda7c..8df7bd1d6 100644
--- a/variants/lora_relay_v1/platformio.ini
+++ b/variants/lora_relay_v1/platformio.ini
@@ -2,6 +2,7 @@
 [env:lora-relay-v1]
 extends = nrf52840_base
 board = lora-relay-v1
+board_level = extra
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
 build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v1
diff --git a/variants/lora_relay_v2/platformio.ini b/variants/lora_relay_v2/platformio.ini
index 93756c6dd..1be8ced1f 100644
--- a/variants/lora_relay_v2/platformio.ini
+++ b/variants/lora_relay_v2/platformio.ini
@@ -2,6 +2,7 @@
 [env:lora-relay-v2]
 extends = nrf52840_base
 board = lora-relay-v2
+board_level = extra
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
 build_flags = ${nrf52840_base.build_flags} -Ivariants/lora_relay_v2
diff --git a/variants/m5stack_core/platformio.ini b/variants/m5stack_core/platformio.ini
index f84e04785..a2330922e 100644
--- a/variants/m5stack_core/platformio.ini
+++ b/variants/m5stack_core/platformio.ini
@@ -1,6 +1,7 @@
 [env:m5stack-core]
 extends = esp32_base
 board = m5stack-core-esp32
+board_level = extra
 upload_port = COM8
 monitor_port = COM8
 monitor_filters = esp32_exception_decoder
diff --git a/variants/m5stack_coreink/platformio.ini b/variants/m5stack_coreink/platformio.ini
index 06f970dba..1a7926d7e 100644
--- a/variants/m5stack_coreink/platformio.ini
+++ b/variants/m5stack_coreink/platformio.ini
@@ -1,6 +1,7 @@
 [env:m5stack-coreink]
 extends = esp32_base
 board = m5stack-coreink
+board_level = extra
 build_src_filter = 
   ${esp32_base.build_src_filter}
 build_flags = 
diff --git a/variants/pca10056-rc-clock/platformio.ini b/variants/pca10056-rc-clock/platformio.ini
index 0dd317816..d965753d3 100644
--- a/variants/pca10056-rc-clock/platformio.ini
+++ b/variants/pca10056-rc-clock/platformio.ini
@@ -1,5 +1,6 @@
 ; The NRF52840-dk development board, but @geeksville's board - which has a busted oscilliator 
 [env:nrf52840dk-geeksville]
+board_level = extra
 extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 5bbde2adf..99e9667b6 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -2,6 +2,7 @@
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
 board = cross_platform
+board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
@@ -10,6 +11,7 @@ build_src_filter = ${portduino_base.build_src_filter}
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 board = linux_hardware
+board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
@@ -18,5 +20,6 @@ build_src_filter = ${portduino_base.build_src_filter}
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 board = linux_arm
+board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
diff --git a/variants/ppr/platformio.ini b/variants/ppr/platformio.ini
index cb7b21de4..22273ce8e 100644
--- a/variants/ppr/platformio.ini
+++ b/variants/ppr/platformio.ini
@@ -2,6 +2,7 @@
 [env:ppr]
 extends = nrf52_base
 board = ppr
+board_level = extra
 lib_deps = 
   ${arduino_base.lib_deps}
   industruino/UC1701@^1.1.0
\ No newline at end of file
diff --git a/variants/ppr1/platformio.ini b/variants/ppr1/platformio.ini
index 40ad508f9..f6c2a5e0b 100644
--- a/variants/ppr1/platformio.ini
+++ b/variants/ppr1/platformio.ini
@@ -2,6 +2,7 @@
 [env:ppr1]
 extends = nrf52_base
 board = ppr1
+board_level = extra
 build_flags = ${nrf52_base.build_flags} -Ivariants/ppr1
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ppr1>
 lib_deps = 
diff --git a/variants/rak11200/platformio.ini b/variants/rak11200/platformio.ini
index 602f5a246..f653adeb2 100644
--- a/variants/rak11200/platformio.ini
+++ b/variants/rak11200/platformio.ini
@@ -1,5 +1,6 @@
 [env:rak11200]
 extends = esp32_base
+board_level = extra
 board = wiscore_rak11200
 build_flags = 
   ${esp32_base.build_flags} -D RAK_11200 -I variants/rak11200
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index 122fbd42f..a169e8a9d 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -1,6 +1,7 @@
 [env:pico]
 extends = rp2040_base
 board = rpipico
+board_level = extra
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index 697ec1caa..6e5c32a52 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -1,6 +1,7 @@
 [env:picow]
 extends = rp2040_base
 board = rpipicow
+board_level = extra
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
diff --git a/variants/tbeam_v07/platformio.ini b/variants/tbeam_v07/platformio.ini
index b63184137..22258b64c 100644
--- a/variants/tbeam_v07/platformio.ini
+++ b/variants/tbeam_v07/platformio.ini
@@ -2,5 +2,6 @@
 [env:tbeam0.7]
 extends = esp32_base
 board = ttgo-t-beam
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags} -D TBEAM_V07 -I variants/tbeam_v07
\ No newline at end of file
diff --git a/variants/tlora_v1_3/platformio.ini b/variants/tlora_v1_3/platformio.ini
index 9d9f41a7c..739f76268 100644
--- a/variants/tlora_v1_3/platformio.ini
+++ b/variants/tlora_v1_3/platformio.ini
@@ -1,5 +1,6 @@
 [env:tlora_v1_3]
 extends = esp32_base
+board_level = extra
 board = ttgo-lora32-v1
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3
\ No newline at end of file
diff --git a/variants/tlora_v2/platformio.ini b/variants/tlora_v2/platformio.ini
index 8710068af..25ae3a360 100644
--- a/variants/tlora_v2/platformio.ini
+++ b/variants/tlora_v2/platformio.ini
@@ -1,5 +1,6 @@
 [env:tlora-v2]
 extends = esp32_base
 board = ttgo-lora32-v1
+board_level = extra
 build_flags = 
   ${esp32_base.build_flags} -D TLORA_V2 -I variants/tlora_v2
\ No newline at end of file
diff --git a/variants/wio-e5/platformio.ini b/variants/wio-e5/platformio.ini
index 0050d4118..32436dae8 100644
--- a/variants/wio-e5/platformio.ini
+++ b/variants/wio-e5/platformio.ini
@@ -1,4 +1,5 @@
 [env:wio-e5]
 extends = stm32wl5e_base
+board_level = extra
 build_flags = ${stm32wl5e_base.build_flags} -Ivariants/wio-e5 -DHAL_DAC_MODULE_ONLY
   -DSERIAL_UART_INSTANCE=1 -DPIN_SERIAL_RX=PB7 -DPIN_SERIAL_TX=PB6