Index: firmware/App/DGCommon.h
===================================================================
diff -u -r1af5c9d200064f18e2727e896f74308e683492a7 -r8fe65bf6222137cc7182ccacff3a5f2fb2f03753
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 8fe65bf6222137cc7182ccacff3a5f2fb2f03753)
@@ -34,44 +34,15 @@
 // 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 DISABLE_ACK_ALARM 1                            // Build switch
     #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 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_EMPTY_BOTTLES_ALARMS    1           // Implement
+    #define DISABLE_COND_STATUS_CHECK       1              // Build switch
+//    #define EMC_TEST_BUILD                  1            // Build switch
 
-//    #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
-    //#define DISABLE_FLOW_CONTROL_TREATMENT  1                     // Not needed
-    #define DISABLE_ACK_ALARM 1                                     // Build switch
 
+    #define DISABLE_RTC_CONFIG              1              // Not needed  TODO investigate and remove
+
+
     #include <stdio.h>
     #include <strings.h>
 #endif