Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r7a7bf19d0cf16745566956f45cef57f8eb5df445 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -83,13 +83,8 @@
 #define DOP_MAX_CURR_WHEN_RUNNING_MA            2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DOP_MAX_CURR_ERROR_DURATION_MS          2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
-#ifndef V2_0_SYSTEM
-    #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
-    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
-#else
-    #define DOP_SPEED_ADC_TO_RPM_FACTOR         1.280938        ///< Conversion factor from ADC counts to RPM for blood pump motor
-    #define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR      0.0003125       ///< ~32 BP motor RPM = 1% PWM duty cycle
-#endif
+#define DOP_SPEED_ADC_TO_RPM_FACTOR             1.751752        ///< Conversion factor from ADC counts to RPM for dialysate outlet pump motor.
+#define DOP_MOTOR_RPM_TO_PWM_DC_FACTOR          0.000193        ///< ~52 BP motor RPM = 1% PWM duty cycle
 #define UF_PWM_DC_PCT_PER_ML_PER_MIN            0.004           ///< Estimated DPo PWM duty cycle amount per each mL/min of ultrafiltration desired.
 #define DOP_CURRENT_ADC_TO_MA_FACTOR            3.002           ///< Conversion factor from ADC counts to mA for dialysate outlet pump motor.
 #define DOP_ADC_FULL_SCALE_V                    3.0             ///< DPo analog signals are 0-3V (while int. ADC ref V may be different).
@@ -105,11 +100,7 @@
 /// Macro converts a flow rate to an estimated PWM duty cycle %.
 #define DOP_PWM_FROM_ML_PER_MIN(rate)           ( (rate) * DOP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DOP_GEAR_RATIO * DOP_MOTOR_RPM_TO_PWM_DC_FACTOR + DOP_PWM_ZERO_OFFSET )
 /// Conversion from PWM duty cycle % to commanded pump motor speed.
-#ifndef V2_0_SYSTEM
-    #define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 4000.0 )
-#else
-    #define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 3200.0 )
-#endif
+#define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm)         ( ((pwm) - DOP_PWM_ZERO_OFFSET) * 4000.0 )
 
 #define PUMP_DIR_ERROR_COUNT_MASK                0x3F           ///< Bit mask for pump direction error counter.
 
@@ -177,9 +168,6 @@
 static U32 errorDialOutRotorSpeedPersistTimerCtr = 0;                                       ///< Persistence timer counter for rotor speed error condition.
 static U32 errorDialOutPumpDirectionPersistTimerCtr = 0;                                    ///< Persistence timer counter for pump direction error condition.
 
-static DIAL_OUT_PUMP_SELF_TEST_STATE_T dialOutPumpSelfTestState = DIAL_OUT_PUMP_SELF_TEST_STATE_START;  ///< Current state of the dialysate outlet pump self-test state machine.
-static U32 dialOutPumpSelfTestTimerCount = 0;                                               ///< Timer counter for time reference during self-test.
-
 static U08 lastDialOutPumpDirectionCount = 0;                                               ///< Previous pump direction error count reported by FPGA
 
 // ********** private function prototypes **********