Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rbe027f8c9bee75f07267f7a9ab5635bbb02df86e -r1d44cf33cf4461b81b19a8ab0e402c609649786b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision be027f8c9bee75f07267f7a9ab5635bbb02df86e)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 1d44cf33cf4461b81b19a8ab0e402c609649786b)
@@ -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;
     }
 
@@ -836,6 +840,7 @@
                                (U32)(trimmerHeaterDutyCycle*100) );
  //NOTE: This section will be removed
 #ifdef DEBUG_ENABLED
+#ifdef HEATERS_DEBUG
     {
        char debugTempStr[ 256 ];
        // TODO: clean up.
@@ -884,6 +889,7 @@
         sendDebugData ( (U08*)debugTempStr, strlen(debugTempStr) );
     }
 #endif
+#endif
         dataPublicationTimerCounter = 0;
     }
 }