Index: firmware/App/HDCommon.h
===================================================================
diff -u -r8a44631f96048e201b1a9a7953530d8b60156e24 -r5c7b301b677c60519a9d89f4624c6020958de752
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 8a44631f96048e201b1a9a7953530d8b60156e24)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 5c7b301b677c60519a9d89f4624c6020958de752)
@@ -42,12 +42,9 @@
 //    #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 DISABLE_WD_AND_SFTY_POST_TESTS  1           // Disable watchdog and safety shutdown POST tests
+      #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
-
     #include <stdio.h>
     #include <strings.h>
 #endif