Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rab7dfc361e5ee347141842b317f1fc2f16e4e3f3 -r5c44a60a37460e1977adc9c1095e9e709a818055
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ab7dfc361e5ee347141842b317f1fc2f16e4e3f3)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 5c44a60a37460e1977adc9c1095e9e709a818055)
@@ -716,12 +716,12 @@
     if ( trimmerHeaterInternalTemp > HEATERS_MAX_ALLOWED_INTERNAL_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, trimmerHeaterInternalTemp );
     }
     else if ( trimmerHeaterColdJunctionTemp > HEATERS_MAX_ALLOWED_COLD_JUNCTION_TEMPERATURE_C )
     {
         isTempOut = TRUE;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
+        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, trimmerHeaterColdJunctionTemp );
     }
 
     // If it is above the range for the first time, stop the trimmer heater
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r127ec607bc555c847170f28800b6d55d46531ee3 -r5c44a60a37460e1977adc9c1095e9e709a818055
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 127ec607bc555c847170f28800b6d55d46531ee3)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 5c44a60a37460e1977adc9c1095e9e709a818055)
@@ -53,12 +53,11 @@
     #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
 
     // Turn these flags on to disable dialysate mixing
     #define DISABLE_DIALYSATE_CHECK         1
     #define DISABLE_MIXING                  1
-    #define USE_SMALL_FLOW_SENSOR_K_FACTOR  1
+    //#define USE_SMALL_FLOW_SENSOR_K_FACTOR  1
     //#define DISABLE_FLOW_CONTROL_TREATMENT  1
 
     #include <stdio.h>