diff --git a/platformio.ini b/platformio.ini
index 8374d2f71a04b2803ee39445abd0e6097f552def..c544ea0789f2400915375da00cfa55916cd1a749 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -64,39 +64,21 @@ lib_deps    = ${common.lib_deps}
 src_filter  = ${common.default_src_filter}
 
 #
-# PrintrBoard (Teensy++ 2.0)
+# Teensy++ 2.0
 #
-[env:printrboard]
+# - PrintrBoard
+# - PrintrBoard Rev.F
+# - Brainwave Pro
+#
+[env:teensy20]
 platform      = teensy
 framework     = arduino
 board         = teensy20pp
-build_flags   = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_PRINTRBOARD
+build_flags   = -I $BUILDSRC_DIR
 #board_f_cpu  = 20000000L     ; Bug in Arduino framework disallows boards running at 20Mhz
 lib_deps      = ${common.lib_deps}
 src_filter    = ${common.default_src_filter}
 
-#
-# PrintrBoard Rev.F (Teensy++ 2.0)
-#
-[env:printrboard_revf]
-platform    = teensy
-framework   = arduino
-board       = teensy20pp
-build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_PRINTRBOARD_REVF
-lib_deps    = ${common.lib_deps}
-src_filter  = ${common.default_src_filter}
-
-#
-# Brainwave Pro (Teensy++ 2.0)
-#
-[env:brainwavepro]
-platform    = teensy
-framework   = arduino
-board       = teensy20pp
-build_flags = -I $BUILDSRC_DIR -D MOTHERBOARD=BOARD_BRAINWAVE_PRO
-lib_deps    = ${common.lib_deps}
-src_filter  = ${common.default_src_filter}
-
 #
 # RAMBo
 #