Index: firmware/App/DGCommon.h
===================================================================
diff -u -rf021b587abd164342311764b9a525fd107761d2d -re6f3a632890f96a5aa282922d11df148bdd06587
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision f021b587abd164342311764b9a525fd107761d2d)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision e6f3a632890f96a5aa282922d11df148bdd06587)
@@ -33,7 +33,6 @@
 #ifndef _VECTORCAST_
 // TODO: Removed debug build flags when release build is ready
 //    #define BOARD_WITH_NO_HARDWARE          1
-//    #define SIMULATE_UI                     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
@@ -44,18 +43,20 @@
     #define ALARMS_DEBUG                    1
 //    #define HEATERS_DEBUG                   1
 //    #define PRESSURES_DEBUG                 1
-    #define DISABLE_DIALYSATE_CHECK         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
-    #define DISABLE_MIXING                  1
+//    #define DISABLE_COND_SENSOR_CHECK       1
 //    #define DISABLE_WATER_QUALITY_CHECK     1
     #define DISABLE_RTC_CONFIG              1
-    //#define V_2_SYSTEM                      1
     #define THD_USING_TRO_CONNECTOR         1
     #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT  1
+
+    // Turn these flags on to disable dialysate mixing
+    #define DISABLE_DIALYSATE_CHECK         1
+    #define DISABLE_MIXING                  1
+
     #include <stdio.h>
     #include <strings.h>
 #endif