Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3b5080777e3dac1b5802ee18227f66a0b49deefa -rdbe4474d0bb8524a9a39bac169244d5cf56641bf
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3b5080777e3dac1b5802ee18227f66a0b49deefa)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision dbe4474d0bb8524a9a39bac169244d5cf56641bf)
@@ -176,6 +176,7 @@
 {
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -186,6 +187,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             // TODO alarm if temperature if out of range or just reject?
         }
+#endif
     }
     else
     {
@@ -217,13 +219,16 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged )
         {
             status = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
         }
+#endif
     }
     else
     {
@@ -324,10 +329,12 @@
 
     if ( TRUE == heaterCmdPtr->startHeater )
     {
+#ifndef DISABLE_TRIMMER_HEATER
         if ( ( MINIMUM_TARGET_TEMPERATURE <= heaterCmdPtr->targetTemp ) && ( heaterCmdPtr->targetTemp <= MAXIMUM_TARGET_TEMPERATURE ) )
         {
             cmdResponse.rejected = FALSE;
-#ifndef DISABLE_HEATERS_AND_TEMPS
+
+            #ifndef DISABLE_HEATERS_AND_TEMPS
             heatersStatus[ DG_TRIMMER_HEATER ].targetTemp        = heaterCmdPtr->targetTemp;
             heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;
 #endif
@@ -336,6 +343,7 @@
         {
             cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
         }
+#endif
     }
     else
     {
@@ -822,12 +830,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/Modes/ModeFill.c
===================================================================
diff -u -r3b5080777e3dac1b5802ee18227f66a0b49deefa -rdbe4474d0bb8524a9a39bac169244d5cf56641bf
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 3b5080777e3dac1b5802ee18227f66a0b49deefa)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision dbe4474d0bb8524a9a39bac169244d5cf56641bf)
@@ -47,7 +47,6 @@
 
 #define DIALYSATE_FILL_TIME_OUT                         ( 5 * SEC_PER_MIN * MS_PER_SECOND )                  ///< Time out period when reservoir is not filled with correct dialysate.
 #define EMPTY_BOTTLE_DETECT_PERSISTENT_PERIOD_MS        ( 5 * MS_PER_SECOND )                                ///< Persistent period for empty bottle detect.
-
 #define CONCENTRATE_PUMP_PRIME_INTERVAL                 ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )        ///< Persistent time interval for concentrate pumps prime.
 
 #define ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER      1.06                                                 ///< Acid and bicarbonate concentrates make up around 6% to total volume.