Index: firmware/App/HDCommon.h
===================================================================
diff -u -r53a25d66832105280c55adc778923ee251fe0b28 -r0c439ddcf7e4d3d4bf63df679eacf2f12f01255f
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 53a25d66832105280c55adc778923ee251fe0b28)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 0c439ddcf7e4d3d4bf63df679eacf2f12f01255f)
@@ -29,21 +29,13 @@
 
 // ********** development build switches **********
 
-// TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
-// Build switches. NOTE: These build switches will remain as #define
-//    #define USING_DEBUGGER                  1           // Want to be able to use the debugger and have break points
+// Build switches. NOTE: These build switches are never considered for release builds.
 //    #define BOARD_WITH_NO_HARDWARE          1           // Target is a PCB w/ no hardware
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
-//    #define DISABLE_BATT_COMM               1           // Disable battery communication  // TODO soft switch
-//    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
-//    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
-//    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
-//      #define DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
-//      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     #include <stdio.h>
     #include <strings.h>