Index: firmware/App/DGCommon.h
===================================================================
diff -u -re53892e8f1701daf89202be6b169a2c12051ade2 -r9279d01e7e539ad1e788b85db4ea2288965b03c6
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision e53892e8f1701daf89202be6b169a2c12051ade2)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
@@ -32,37 +32,33 @@
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
-//    #define BOARD_WITH_NO_HARDWARE          1            // Build switch
-//    #define TASK_TIMING_OUTPUT_ENABLED      1            // Build switch   // re-purposes drain pump enable pin for task timing
-//    #define DISABLE_HEATERS_AND_TEMPS       1            // Implement
-//    #define DISABLE_ACCELS                  1            // Implement
-//    #define SKIP_POST                       1            // Not needed
-    #define SKIP_CAL_CHECK               1                 // Implement
-//    #define ENABLE_DIP_SWITCHES             1            // Not needed
-//    #define EMC_TEST_BUILD                  1            // Build switch
-    #define ALARMS_DEBUG                    1              // Not needed
-//    #define HEATERS_DEBUG                   1            // Not needed
-//    #define PRESSURES_DEBUG                 1            // Not needed
- //   #define IGNORE_DRAIN_PUMP_MONITOR       1            // Build switch
-    #define IGNORE_HEATERS_MONITOR          1              // Build switch
-    #define IGNORE_RO_PUMP_MONITOR          1              // Build switch
-    #define DISABLE_RO_RATIO_CHECK          1              // Implement
-    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom    // Implement
-    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom    // Implement
-    #define DISABLE_RTC_CONFIG              1              // Not needed
-    #define THD_USING_TRO_CONNECTOR         1              // Build switch
-    #define DISABLE_FLOW_CHECK_IN_FILL      1              // Implement
-    #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1          // Not needed
-//    #define NEW_FMD_FLOW_SENSOR             1            // Not needed
-    #define DISABLE_HEATERS_EFFICIENCY      1
-
+//    #define BOARD_WITH_NO_HARDWARE          1
+//    #define TASK_TIMING_OUTPUT_ENABLED      1           // re-purposes drain pump enable pin for task timing
+//    #define DISABLE_HEATERS_AND_TEMPS       1
+    #define DISABLE_ACCELS                  1
+//    #define SKIP_POST                       1
+    #define SKIP_CAL_CHECK               1
+//    #define ENABLE_DIP_SWITCHES             1
+//    #define EMC_TEST_BUILD                  1
+    #define ALARMS_DEBUG                    1
+//    #define HEATERS_DEBUG                   1
+//    #define PRESSURES_DEBUG                 1
+ //   #define IGNORE_DRAIN_PUMP_MONITOR       1
+    #define IGNORE_HEATERS_MONITOR          1
+    #define IGNORE_RO_PUMP_MONITOR          1
+    #define DISABLE_RO_RATIO_CHECK          1
+    #define DISABLE_COND_SENSOR_CHECK       1    // Disabled for Tom
+//    #define DISABLE_WATER_QUALITY_CHECK     1    // Disabled for Tom
+    #define DISABLE_RTC_CONFIG              1
+    #define THD_USING_TRO_CONNECTOR         1
+    #define DISABLE_FLOW_CHECK_IN_FILL      1
+    #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
+//    #define NEW_FMD_FLOW_SENSOR             1
     #define DISABLE_COND_STATUS_CHECK       1            /// Build switch
-    #define DISABLE_DISINFECT_CONDUCTIVITY 1           // Implement
-//    #define DISABLE_CONC_PUMPS             1
-//    #define DISABLE_CAP_SWITCHES            1           // Implement
-    #define DISABLE_UV_REACTORS             1
-    #define DISABLE_ACID_BICARB_ALARMS      1            // Implement
 
+    #define DISABLE_PRIME_CONCENT_LINES        1
+    #define DISABLE_BICARB_CONDUCTIVITY_TEST   1
+    #define DISABLE_ACID_CONDUCTIVITY_TEST     1
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1  // Disabled for Tom  // Implement
 //    #define DISABLE_MIXING                  1                     // Implement