Index: firmware/App/Controllers/ConcentratePumps.h
===================================================================
diff -u -rfcd31ba31379396ba18db1a7e13b9f26d7837958 -r7d3e5b35359ec72659c7ce2f9ecdcb58d33a959f
--- firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision fcd31ba31379396ba18db1a7e13b9f26d7837958)
+++ firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision 7d3e5b35359ec72659c7ce2f9ecdcb58d33a959f)
@@ -31,7 +31,7 @@
 
 // ********** public definitions **********
 // For 150 RPM, Diener pump delivers 60ml/min
-#define CONCENTRATE_PUMP_MAX_SPEED              200.0F              ///< Maximum Diener pump speed for concentrate pump in mL/min
+#define CONCENTRATE_PUMP_MAX_SPEED              180.0F              ///< Maximum Diener pump speed for concentrate pump in mL/min
 #define CONCENTRATE_PUMP_MIN_SPEED              20.0F               ///< Minimum Diener pump speed for concentrate pump in mL/min
 #define DOSING_ACID_CONCENTRATE_PUMP_SPEED      60.0F               ///< Diener pump speed for acid pump
 #define DOSING_CONCENTRATE_PUMP_SPEED           100.F               ///< Dosing pump speed for spent chamber fill for acid and bicarb pumps
Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r9eae2f683887bededd2240f51ddfc667d8c1d566 -r7d3e5b35359ec72659c7ce2f9ecdcb58d33a959f
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 9eae2f683887bededd2240f51ddfc667d8c1d566)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 7d3e5b35359ec72659c7ce2f9ecdcb58d33a959f)
@@ -272,25 +272,15 @@
 static RINSE_PUMP_STATE_T handleRinsePumpOffState( void )
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_OFF;
-
+    F32 pwmPercent;
     rinsePumpTargetSpeedRPM = 0;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
-    {
-        F32 pwmPercent;
+    // Set PWM to zero to stop the logical rinse pump
+    rinsePumpPwmPercentage.data = 0.0F;
+    // PWM should be zero. Ignore the override value for rinsePumpPwmPercentage if any.
+    pwmPercent = rinsePumpPwmPercentage.data;
+    setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
 
-        // Set PWM to zero to stop the logical rinse pump
-        rinsePumpPwmPercentage.data = 0.0F;
-        // PWM should be zero. Ignore the override value for rinsePumpPwmPercentage if any.
-        pwmPercent = rinsePumpPwmPercentage.data;
-        setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
-    }
-    else
-    {
-        // Set PWM count zero to stop the logical rinse pump
-        setRinsePumpPwm( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
-    }
-
     return state;
 }
 
@@ -304,18 +294,14 @@
 static RINSE_PUMP_STATE_T handleRinsePumpOnState( void )
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
+    F32 pwmPercent;
 
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
-    {
-        F32 pwmPercent;
+    rinsePumpPwmPercentage.data = RINSE_PUMP_DEFAULT_PWM_PERCENT;
+    pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );
 
-        rinsePumpPwmPercentage.data = RINSE_PUMP_DEFAULT_PWM_PERCENT;
-        pwmPercent   = getF32OverrideValue( &rinsePumpPwmPercentage );
+    // Turn on logical rinse pump with given PWM value
+    setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
 
-        // Turn on logical rinse pump with given PWM value
-        setRinsePumpPwm( D79_RINSE_PUMP, pwmPercent );
-    }
-
     return state;
 }