Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r1afd5c87ef15399998a743c2ebcafe2cc03bd363 -r606c80dafe7c1de63b99d775e032a0cc28922a49
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1afd5c87ef15399998a743c2ebcafe2cc03bd363)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 606c80dafe7c1de63b99d775e032a0cc28922a49)
@@ -652,16 +652,9 @@
 {
     UF_STATE_T result;
 
-    if ( maxUFVolumeML < NEARLY_ZERO )
-    {
-        result = UF_OFF_STATE;
-    }
-    else
-    {
-        lastUFTimeStamp = getMSTimerCount();
-        uFTimeMS = 0;
-        result = UF_RUNNING_STATE;
-    }
+    lastUFTimeStamp = getMSTimerCount();
+    uFTimeMS = 0;
+    result = UF_RUNNING_STATE;
 
     return result;
 }
@@ -774,26 +767,8 @@
  *************************************************************************/
 static UF_STATE_T handleUFOffState( DIALYSIS_STATE_T *dialysisState )
 {
-    UF_STATE_T result = UF_OFF_STATE;
+    UF_STATE_T result = UF_RUNNING_STATE;
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
-    // Handle saline bolus start request from user
-    if ( TRUE == salineBolusStartRequested )
-    {
-        salineBolusAutoResumeUF = FALSE;
-        // Go to saline bolus state
-        if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState )
-        {
-            *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-        }
-        else
-        {
-            salineBolusStartRequested = FALSE;
-        }
-    }
-
     return result;
 }