Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -rf0ab8f06e0c8af10bd8db099927669dbd94326b8 -ra8a9efaaea2ba9f38705b4ec2d47ff1252c833e2
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision f0ab8f06e0c8af10bd8db099927669dbd94326b8)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision a8a9efaaea2ba9f38705b4ec2d47ff1252c833e2)
@@ -43,7 +43,6 @@
 #define DATA_PUBLISH_COUNTER_START_COUNT                    60                                                      ///< Data publish counter start count.
 #define DP_CONTROL_INTERVAL_MS                              1000                                                    ///< Dialysate pump control interval in ms
 #define DP_CONTROL_INTERVAL                                 ( DP_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL )      ///< Interval (ms/task time) at which the dialysate pump is controlled.
-#define DP_CONTROL_SAMPLE_PERIOD                            ( (F32)DP_CONTROL_INTERVAL_MS / (F32) MS_PER_SECOND )   ///< Control interval sample period
 #define DIALYSATE_PUMP_CONTROL_RUN                          0x01                                                    ///< Dialysate pump control run pump.
 #define DIALYSATE_PUMP_CONTROL_STOP                         0x00                                                    ///< Dialysate pump control stop pump.
 #define DIALYSATE_PUMP_FORWARD_DIR                          1                                                       ///< Dialysate pump forward direction. reverse direction is not allowed.
@@ -215,11 +214,11 @@
 
     // Initialize the fresh dialysate pump PI controller
     initializePIController( PI_CONTROLLER_ID_D12_PUMP, FRESH_DIAL_OPEN_LOOP_SPEED_RPM, D12_PUMP_P_COEFFICIENT, D12_PUMP_I_COEFFICIENT,
-                            MIN_DIALYSATE_PUMP_RPM, MAX_DIALYSATE_PUMP_RPM, FALSE, DIAL_PUMP_NO_FEED_FORWARD, DP_CONTROL_SAMPLE_PERIOD );
+                            MIN_DIALYSATE_PUMP_RPM, MAX_DIALYSATE_PUMP_RPM, FALSE, DIAL_PUMP_NO_FEED_FORWARD );
 
     // Initialize spent dialysate pump PI controller
     initializePIController( PI_CONTROLLER_ID_D48_PUMP, SPENT_DIAL_OPEN_LOOP_SPEED_RPM, D48_PUMP_P_COEFFICIENT, D48_PUMP_I_COEFFICIENT,
-                            MIN_DIALYSATE_PUMP_RPM, MAX_DIALYSATE_PUMP_RPM,FALSE, DIAL_PUMP_NO_FEED_FORWARD, DP_CONTROL_SAMPLE_PERIOD );
+                            MIN_DIALYSATE_PUMP_RPM, MAX_DIALYSATE_PUMP_RPM,FALSE, DIAL_PUMP_NO_FEED_FORWARD );
 
     // Init the dialysate pump with valid PWM while motor is disabled.
     // when enable triggers, we dont want invlid RPM set that triggers alarm in motor controller.
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r9ee16bedc8686e674f2cdee571a7c4f93df178ea -ra8a9efaaea2ba9f38705b4ec2d47ff1252c833e2
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 9ee16bedc8686e674f2cdee571a7c4f93df178ea)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a8a9efaaea2ba9f38705b4ec2d47ff1252c833e2)
@@ -90,10 +90,8 @@
 
 #define D5_HEAT_CONTROL_INTERVAL_MS                                30000                                                           /// Primary heater control interval in milli seconds
 #define D5_HEAT_CONTROL_INTERVAL_COUNT                             ( D5_HEAT_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL )         ///< Primary heater control interval count.
-#define D5_HEAT_CONTROL_SAMPLE_PERIOD                              ( (F32)D5_HEAT_CONTROL_INTERVAL_MS / (F32)MS_PER_SECOND )       ///< Primary heater control sample period.
 #define D45_HEAT_CONTROL_INTERVAL_MS                               ( 1 * MS_PER_SECOND )                                           ///< Trimmer heater control interval in milli seconds
 #define D45_HEAT_CONTROL_INTERVAL_COUNT                            ( D45_HEAT_CONTROL_INTERVAL_MS / TASK_GENERAL_INTERVAL )        ///< Trimmer heater control interval count.
-#define D45_HEAT_CONTROL_SAMPLE_PERIOD                             ( (F32)D45_HEAT_CONTROL_INTERVAL_MS / (F32)MS_PER_SECOND )      ///< Trimmer heater control sample period.
 #define PRIMARY_HEATER_MAX_PWR_WATTS                               1400.0F                                                         ///< AC Primary Heater Max Power consumeption in Watts
 #define TX_PRIMARY_HEATER_MAX_PWR_WATTS                            700.0F                                                          ///< Estimated power to be supplied to the primary heater during treatement mode
 #define HEAT_PRIMARY_HEATER_MAX_PWR_WATTS                          980.0F                                                          ///< Estimated power to be supplied to the primary heater during heat disinfect mode
@@ -228,11 +226,11 @@
 
     // Initialize the primary heater PI controller
     initializePIController( PI_CONTROLLER_ID_D5_HEAT, HEATERS_MIN_DUTY_CYCLE, D5_HEAT_TX_P_COEFFICIENT, D5_HEAT_TX_I_COEFFICIENT,
-                            HEATERS_MIN_DUTY_CYCLE, AC_HEATER_TX_MAX_DUTY_CYCLE, TRUE, D5_HEAT_TX_INIT_FEED_FORWARD, D5_HEAT_CONTROL_SAMPLE_PERIOD );
+                            HEATERS_MIN_DUTY_CYCLE, AC_HEATER_TX_MAX_DUTY_CYCLE, TRUE, D5_HEAT_TX_INIT_FEED_FORWARD );
 
     // Initialize the trimmer heater PI controller
     initializePIController( PI_CONTROLLER_ID_D45_HEAT, HEATERS_MIN_DUTY_CYCLE, D45_HEAT_P_COEFFICIENT, D45_HEAT_I_COEFFICIENT,
-                            HEATERS_MIN_DUTY_CYCLE, DC_HEATER_MAX_DUTY_CYCLE, FALSE, D45_HEAT_TX_INIT_FEED_FORWARD, D45_HEAT_CONTROL_SAMPLE_PERIOD );
+                            HEATERS_MIN_DUTY_CYCLE, DC_HEATER_MAX_DUTY_CYCLE, FALSE, D45_HEAT_TX_INIT_FEED_FORWARD );
 
 #ifdef __HEATERS_DEBUG__
     for ( i = 0;  i < NUM_OF_CONTROLLER_SIGNAL; i++ )
Index: firmware/App/DDCommon.h
===================================================================
diff -u -rf0ab8f06e0c8af10bd8db099927669dbd94326b8 -ra8a9efaaea2ba9f38705b4ec2d47ff1252c833e2
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision f0ab8f06e0c8af10bd8db099927669dbd94326b8)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision a8a9efaaea2ba9f38705b4ec2d47ff1252c833e2)
@@ -37,7 +37,7 @@
 //#define USE_PT_100              1
 
 //Uncomment the below line for new dosing pump testing
-#define __PUMPTEST__            1
+//#define __PUMPTEST__            1
 
 //Uncomment below line for future hardware version
 //#define __ALPHA_AO_VER__        1