Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf5dc98b3d5fcd39e3ab502fbe81110e188ce0ec5 -r7c077d84b9db9f8b14d4ab49d4b02a7f41e8f923
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f5dc98b3d5fcd39e3ab502fbe81110e188ce0ec5)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 7c077d84b9db9f8b14d4ab49d4b02a7f41e8f923)
@@ -53,7 +53,9 @@
 #define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 500 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is monitored.
+
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 50 / TASK_GENERAL_INTERVAL )                      ///< Interval (ms/task time) at which the concentrate pump is controlled.
+
 #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
 /// Enumeration of concentrate pump states.
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rf5dc98b3d5fcd39e3ab502fbe81110e188ce0ec5 -r7c077d84b9db9f8b14d4ab49d4b02a7f41e8f923
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f5dc98b3d5fcd39e3ab502fbe81110e188ce0ec5)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 7c077d84b9db9f8b14d4ab49d4b02a7f41e8f923)
@@ -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
     {
@@ -330,7 +335,7 @@
 
             heatersStatus[ DG_TRIMMER_HEATER ].targetTemp        = heaterCmdPtr->targetTemp; // TODo do we need to remove this since the trimmer heater is set in the reservoirs
 #ifndef DISABLE_HEATERS_AND_TEMPS
-            //heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;  // DEBUG_DENALI
+            heatersStatus[ DG_TRIMMER_HEATER ].startHeaterSignal = TRUE;
 #endif
         }
         else
@@ -900,12 +905,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