Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r49d5fccc324cf982ac4fdd89f7f7accb0bbbfe59 -r8cda0962f1683f3bbf63dba88fa1b9161ca89733
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 49d5fccc324cf982ac4fdd89f7f7accb0bbbfe59)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8cda0962f1683f3bbf63dba88fa1b9161ca89733)
@@ -1160,9 +1160,6 @@
     // Check for occlusion
     stopPump = checkOcclusionOrEmpty( stopPump );
 
-    // Check if time to stop Heparin delivery
-    // TODO - implement pre-stop check
-
     // Check position > max travel
     stopPump = checkMaxTravel( stopPump, SYRINGE_PUMP_EMPTY_POS + SYRINGE_PUMP_EMPTY_POS_MARGIN );
 
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r49d5fccc324cf982ac4fdd89f7f7accb0bbbfe59 -r8cda0962f1683f3bbf63dba88fa1b9161ca89733
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 49d5fccc324cf982ac4fdd89f7f7accb0bbbfe59)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 8cda0962f1683f3bbf63dba88fa1b9161ca89733)
@@ -298,7 +298,7 @@
     setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
-    // TODO - stop Heparin pump
+    stopSyringePump();
     // Tell DG to stop heating dialysate
     cmdStopDGTrimmerHeater();
 }