Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb6fb8796a82272af1b5791be8cd3fc3b445e0f1d -r2e2fde674cbd1ad7d5de802205b6d25fdb388854
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b6fb8796a82272af1b5791be8cd3fc3b445e0f1d)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2e2fde674cbd1ad7d5de802205b6d25fdb388854)
@@ -184,6 +184,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -194,6 +195,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -227,6 +229,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -rb6fb8796a82272af1b5791be8cd3fc3b445e0f1d -r2e2fde674cbd1ad7d5de802205b6d25fdb388854
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision b6fb8796a82272af1b5791be8cd3fc3b445e0f1d)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2e2fde674cbd1ad7d5de802205b6d25fdb388854)
@@ -322,9 +322,6 @@
     // Persistent alarm for the temperature sensors range check
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
 
-    // Persistent alarm for the temperature sensors range check
-    initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS, TEMP_SENSORS_OUT_OF_RANGE_TIME_OUT_MS );
-
     // Persistent alarm for the temperature sensors error bit fault check
     initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS, TEMP_SENSORS_ERROR_BIT_TIMEOUT_MS );