Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rb0274b90a67182102131303e33ca333fd9c92ad9 -ra03a5119712cea509ec345bd4f650ffcdb9a9438
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision b0274b90a67182102131303e33ca333fd9c92ad9)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a03a5119712cea509ec345bd4f650ffcdb9a9438)
@@ -112,7 +112,7 @@
 #define D5_HEAT_OUT_LOWQD_TX_P_COEFFICIENT                         0.5F                                                            ///< P Term for AC primary heater outer loop - low Qd(<200) control during treatment mode.
 #define D5_HEAT_OUT_LOWQD_TX_I_COEFFICIENT                         0.25F                                                           ///< I Term for AC primary heater outer loop - low Qd(<200) control during treatment mode.
 #define D5_HEAT_HIGH_DIAL_FLOW_RATE                                200.0F                                                          ///< Decide Primary heater outer loop - PI control based on the dialysate flow rate
-#define D5_HEAT_TARGET_ESTIMATE_MAX                                48.0F                                                           ///< Heat loss estimation maximum target temperature for D5 control
+#define D5_HEAT_TARGET_ESTIMATE_MAX                                46.0F                                                           ///< Heat loss estimation maximum target temperature for D5 control
 
 #define D5_HEAT_OUT_MIN_DELTA_TEMP                                 0.0F                                                            ///< Minimum Delta temperature that can be adjusted for D5 control
 #define D5_HEAT_OUT_MAX_DELTA_TEMP                                 50.0                                                            ///< Maximum Delta temperature that can be adjusted for D5 control
@@ -1496,25 +1496,11 @@
         data.d5_HeaterDC                = getHeaterControl( D5_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
         data.d45_HeaterDC               = getHeaterControl( D45_HEAT ) * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
         data.d5_HeaterTargetTemp        = getHeaterTargetTemperature( D5_HEAT );
-#if 1
-        //TODO : remove this code, for debug only
-        data.d45_HeaterTargetTemp       = prevDialyzerTemperature;
-#else
         data.d45_HeaterTargetTemp       = getHeaterTargetTemperature( D45_HEAT );
-#endif
         data.d5_HeaterState             = heatersStatus[ D5_HEAT ].state;
-#if 1
-        //TODO : remove this code, for debug only
-        data.d45_HeaterState            = (U32)isTempRiseDeteced;
-#else
         data.d45_HeaterState            = heatersStatus[ D45_HEAT ].state;
-#endif
         data.d5_feedforward             = d5FeedForward * HEATERS_DUTY_CYCLE_CONVERSION_FACTOR;
-#if 1
-        data.d5_PWMPeriod               = (F32)isOffsetRemovedForLowQds;
-#else
         data.d5_PWMPeriod               = getHeaterPWMPeriod( D5_HEAT );
-#endif
         data.d5_adjsutedTargetTemp      = adjustedPrimaryTargetTemp;
         data.d5_targetTempFromTD        = getTDTargetDialysateTemperature();
 #ifdef __HEATERS_DEBUG__