Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rd838fbaa8507b883fa112e69137e86fc9fb2cb6f -r388a6f1cf7661a973b0b08c2eeb4de30522c1e88
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d838fbaa8507b883fa112e69137e86fc9fb2cb6f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 388a6f1cf7661a973b0b08c2eeb4de30522c1e88)
@@ -231,7 +231,9 @@
     if ( primaryHeaterTargetTemperature >= MINIMUM_TARGET_TEMPERATURE &&
          primaryHeaterTargetTemperature <= MAXIMUM_TARGET_TEMPERATURE  )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         hasStartPrimaryHeaterRequested = TRUE;
+#endif
         status = TRUE;
     }
 
@@ -256,7 +258,9 @@
     if ( trimmerHeaterTargetTemperature >= MINIMUM_TARGET_TEMPERATURE &&
          trimmerHeaterTargetTemperature <= MAXIMUM_TARGET_TEMPERATURE )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         hasStartTrimmerHeaterRequested = TRUE;
+#endif
         status = TRUE;
     }
 
@@ -847,6 +851,7 @@
                                (U32)(trimmerHeaterDutyCycle*100) );
  //NOTE: This section will be removed
 #ifdef DEBUG_ENABLED
+#ifdef HEATERS_DEBUG
     {
        char debugTempStr[ 256 ];
        sprintf( debugTempStr, "TPo: %6.2f, PriCJ: %6.2f, PriTC: %6.2f, TpriInt: %6.2f, TRo: %6.2f, TriCJ: %6.2f, TriTC: %6.2f, TtriInt: %6.2f\r\n",
@@ -863,6 +868,7 @@
         sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
     }
 #endif
+#endif
         dataPublicationTimerCounter = 0;
     }
 }