Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -r9f5e68247ff2f5214e8828a1b8152ea16941fe39
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9f5e68247ff2f5214e8828a1b8152ea16941fe39)
@@ -223,14 +223,6 @@
                     currentTreatmentState = TREATMENT_DIALYSIS_STATE;
                     break;
 
-                case TREATMENT_RINSEBACK_PAUSE_STATE:
-                    // TODO - implement
-                    break;
-
-                case TREATMENT_RECIRC_PAUSE_STATE:
-                    // TODO - implement
-                    break;
-
                 default:
                     // Ignore
                     break;
@@ -291,26 +283,10 @@
             // TODO - implement
             break;
 
-        case TREATMENT_RINSEBACK_PAUSE_STATE:
-            // TODO - implement
-            break;
-
-        case TREATMENT_RECIRC_SETUP_STATE:
-            // TODO - implement
-            break;
-
         case TREATMENT_RECIRC_STATE:
             // TODO - implement
             break;
 
-        case TREATMENT_RECIRC_PAUSE_STATE:
-            // TODO - implement
-            break;
-
-        case TREATMENT_RECIRC_STOP_STATE:
-            // TODO - implement
-            break;
-
         case TREATMENT_DIALYSIS_END_STATE:
             // TODO - implement
             break;
@@ -906,7 +882,7 @@
         // Compute minimum treatment duration
         U32 presTime = ( presTreatmentTimeSecs / SEC_PER_MIN );
         U32 elapseTime = CALC_ELAPSED_TREAT_TIME_IN_MIN();
-        U32 minTime = MAX( (elapseTime + 2), MIN_TREATMENT_TIME_MINUTES );  // Treatment duration cannot be < 1 hour. add two minutes to cover rounding and ensure it's valid for next minute
+        U32 minTime = MAX( (elapseTime + 2), MIN_TREATMENT_TIME_MINUTES );  // Treatment duration cannot be < 1 hour. add two minutes to cover rounding and ensure it is valid for next minute
         // Compute maximum treatment duration (from both UF and dialysate volume perspectives)
         U32 maxTimeRem = ( MAX_UF_VOLUME_ML - (U32)getUltrafiltrationVolumeCollected() ) / ( presUFRate > 0.0 ? (U32)presUFRate : 1 );
         U32 maxTime1 = minTime + maxTimeRem;