Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r5663522c4c9ad7869cc98b28a585cc83c3703dbd -r794645f44a80d2a3b8a62f284036ca556787f78c
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 5663522c4c9ad7869cc98b28a585cc83c3703dbd)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 794645f44a80d2a3b8a62f284036ca556787f78c)
@@ -860,10 +860,13 @@
     {
         salineBolusStartRequested = FALSE;
         // Cmd all pumps to stop
-        setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-        stopSyringePump();
+        stopDialysis();
+/*
+ *       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 );
+ *       stopSyringePump();
+ */
         // Begin saline bolus
         result = SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP;
     }
@@ -888,7 +891,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
@@ -965,8 +967,6 @@
         // Hard stop blood and dialysate pumps
         signalBloodPumpHardStop();
         signalDialInPumpHardStop();
-        // Tell DG to stop heating dialysate
-        cmdStopDGTrimmerHeater();
         // Send last saline bolus data
         salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL;
         publishSalineBolusData();