Index: firmware/App/HDCommon.h
===================================================================
diff -u -rc1fb1a78a5e2373c5813a70f6a66fa8ca8945ff1 -rf9570a9717805d0759622da836a33ee04f3fa40f
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision c1fb1a78a5e2373c5813a70f6a66fa8ca8945ff1)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision f9570a9717805d0759622da836a33ee04f3fa40f)
@@ -38,13 +38,12 @@
 //    #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
+      #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
-//    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor  // Part of DVT build switch
+//      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
       // TODO stays as a build switch until the calibration structure is updated with the build
       #define SKIP_CAL_CHECK                  1           // Implement software configuration