Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -ra657feb0cc008fa976753323207327ddd02d4f2b
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision a657feb0cc008fa976753323207327ddd02d4f2b)
@@ -93,6 +93,7 @@
 
 /// Expected position of empty in relation to home position.
 #define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84F )
+
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5F )
 /// Minimum retract position.
@@ -156,8 +157,10 @@
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 #define SYRINGE_PUMP_DAC_MAX_RETRIES                  5                                     ///< Syringe pump DAC retries to write.
 #define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )      ///< Syringe pump DAC timer between retries.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r28b8a8b1d8e6abb14336eb9d67f355f436de2c49 -ra657feb0cc008fa976753323207327ddd02d4f2b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 28b8a8b1d8e6abb14336eb9d67f355f436de2c49)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a657feb0cc008fa976753323207327ddd02d4f2b)
@@ -668,8 +668,7 @@
 
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
-    //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+    setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     cmdStartDGTrimmerHeater();
 }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -ra657feb0cc008fa976753323207327ddd02d4f2b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a657feb0cc008fa976753323207327ddd02d4f2b)
@@ -361,7 +361,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }