Index: firmware/App/HDCommon.h
===================================================================
diff -u -r29a2c3c7d7618489c0ada9f98e1d30226b455392 -r2a3a47ca90ad19851a30c52f6999a56d5f578783
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 29a2c3c7d7618489c0ada9f98e1d30226b455392)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 2a3a47ca90ad19851a30c52f6999a56d5f578783)
@@ -43,37 +43,19 @@
 //    #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 POSTh
+      #define DISABLE_UI_POST_TEST            1           // Disable the UI POST
 
     // TODO convert the new configuration way
-//    #define DISABLE_ACCELS                  1           // Disable accelerometer POST and monitoring              // Implement
 //    #define RUN_BP_OPEN_LOOP                1           // Run blood pump in open loop mode                       // Implement
 //    #define RUN_DPI_OPEN_LOOP               1           // Run dialysate inlet pump in open loop mode             // Implement
 //    #define PBA_ESTIMATION                  1           // Estimate arterial pressure rather than look at PBA sensor  // Part of DVT build switch
 //    #define USE_PBO_AS_PBA                  1           // PBo readings used for PBA, PBo replaced with fixed pressure (100 mmHg) // Not needed
 
-//    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks              // Implement  // TODO implemented CHECK THE LAST ONE
-//    #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check                      // Implement  // TODO implemented
-    #define SKIP_CAL_CHECK               1                                                                          // Implement
-//    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback) // Not needed
+    #define SKIP_CAL_CHECK               1                                                                          // Implement TODO stays as a build switch until the calibration structure is updated
 
-//    #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest                       // Implement  // TODO implemented
-
-//    #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.                      // Implement // TODO implemented
-    #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.                         // Implement
-//    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check                           // Implement
-
-    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms                            // Implement
-    #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute    // Implement
+//    #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute    // Implement
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps        // Implement
-//    #define DISABLE_BUBBLE_ALARMS           1           // Disable bubble alarms                                    // Implement // TODO implemented
 
-//    #define DISABLE_UI_COMM_TO_ALARM        1           // Disable UI comm timeouts                               // Implement
-
-//    #define DISABLE_ILLEGAL_AIR_TRAP_ALARM  1           // Disable illegal state for air trap alarm                 // Implement // TODO implemented
-    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms                         // Implement
-
-
     #include <stdio.h>
     #include <strings.h>
 #endif