Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r9f5e68247ff2f5214e8828a1b8152ea16941fe39 -rb4114c4cd078650769bf8a0379f47989660cc6e1
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 9f5e68247ff2f5214e8828a1b8152ea16941fe39)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision b4114c4cd078650769bf8a0379f47989660cc6e1)
@@ -171,7 +171,6 @@
         pendingUserEndTreatmentRequest = TRUE;
         result = TRUE;
     }
-    sendTreatmentEndResponseMsg( result );
 
     return result;
 }
@@ -287,10 +286,6 @@
             // TODO - implement
             break;
 
-        case TREATMENT_DIALYSIS_END_STATE:
-            // TODO - implement
-            break;
-
         case TREATMENT_END_STATE:
             // TODO - implement
             endAirTrapControl();  // TODO - move to appropriate place
@@ -454,7 +449,7 @@
 
     // Check if we are in an appropriate treatment state for settings adjustment
     if ( ( MODE_TREA == currMode ) &&
-         ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_DIALYSIS_END_STATE ) &&
+         ( currentTreatmentState > TREATMENT_START_STATE ) &&
          ( CALC_ELAPSED_TREAT_TIME_IN_MIN() < treatmentTime ) && ( treatmentTime >= MIN_TREATMENT_TIME_MINUTES ) )
     {
         F32 uFVolume;
@@ -493,8 +488,7 @@
         {
             rejectReason = REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE;
         }
-        else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) ||
-                  ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE ) )
+        else if ( currentTreatmentState <= TREATMENT_START_STATE )
         {
             rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
         }
@@ -541,7 +535,7 @@
 
     // Check if we are in an appropriate treatment state for settings adjustment
     if ( ( MODE_TREA == currMode ) &&
-         ( currentTreatmentState > TREATMENT_START_STATE ) && ( currentTreatmentState < TREATMENT_DIALYSIS_END_STATE ) &&
+         ( currentTreatmentState > TREATMENT_START_STATE ) &&
          ( uFVolume <= MAX_UF_VOLUME_ML ) &&
          ( CALC_TREAT_TIME_REMAINING_IN_SECS() >= PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC ) )
     {
@@ -599,8 +593,7 @@
         {
             rejectReason = REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE;
         }
-        else if ( ( currentTreatmentState <= TREATMENT_START_STATE ) ||
-                  ( currentTreatmentState >= TREATMENT_DIALYSIS_END_STATE ) )
+        else if ( currentTreatmentState <= TREATMENT_START_STATE )
         {
             rejectReason = REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE;
         }
@@ -849,7 +842,6 @@
     {
         stopDialysis();
         elapsedTreatmentTimeInSecs = presTreatmentTimeSecs;
-        currentTreatmentState = TREATMENT_DIALYSIS_END_STATE;
     }
     // Broadcast treatment time and state data at interval
     if ( ++treatmentTimeBroadcastTimerCtr >= TREATMENT_TIME_DATA_PUB_INTERVAL )