Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r28d515e25f5f3b2c0bbff55abd68641927b6659c -rc124da1c51c10b6b646559323db27acda273d62b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 28d515e25f5f3b2c0bbff55abd68641927b6659c)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c124da1c51c10b6b646559323db27acda273d62b)
@@ -752,18 +752,16 @@
     if ( CALC_ELAPSED_TREAT_TIME_IN_SECS() >= presTreatmentTimeSecs )
     {
         treatmentCompleted = TRUE;
-//        sendLastTreatmentPeriodicData = TRUE;
-//        treatmentEndTimeStamp = getRTCTimestamp();
-//        pauseDialysis();
+//      sendLastTreatmentPeriodicData = TRUE;
+//      treatmentEndTimeStamp = getRTCTimestamp();
+//      pauseDialysis();
 
-        /// CKOE
-      //  stopDialysis();
+//        stopDialysis();
         transitionToTreatmentEnd();
 
         //CKOE Do we need data to broadd cast here
-        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_END_OF_TREATMENT_WARNING, presTreatmentTimeSecs );
         // Trigger the low-priority End of Treatment alarm
-        activateAlarmNoData( ALARM_ID_TD_END_OF_TREATMENT );
+        //activateAlarmNoData( ALARM_ID_TD_END_OF_TREATMENT );
         result = TREATMENT_END_STATE;
     }
     // Otherwise, execute state machine for treatment dialysis sub-mode
@@ -942,26 +940,24 @@
 {
     TREATMENT_STATE_T result = TREATMENT_END_STATE;
 
-//    // Handle final rinseback alarm response from user
-  if ( TRUE == initiateRinsebackAlarmResponseRequest )
+   // Handle final rinseback alarm response from user
+    if ( TRUE == initiateRinsebackAlarmResponseRequest )
     {
        signalTreatmentEndAlarmRinsebackUserAction();
-   }
-  // Handle alarm response from user to end treatment w/o rinseback
-  else if ( TRUE == endTreatmentAlarmResponseRequest )
-   {
-      //sendLastTreatmentPeriodicData = TRUE;         TODO
-      requestNewOperationMode( MODE_POST );
     }
-   // End treatment state does not allow resume
+    else if ( TRUE == endTreatmentAlarmResponseRequest )
+    {
+        requestNewOperationMode( MODE_POST );
+    }
 
    // Execute treatment end sub-mode
     execTreatmentEnd();
-  if ( TRUE == treatmentEndToRinsebackRequest )
-   {
+
+    if ( TRUE == treatmentEndToRinsebackRequest )
+    {
         transitionToRinseback();
         result = TREATMENT_RINSEBACK_STATE;
-   }
+    }
     return result;
 }
 /*********************************************************************//**