Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r0fce4283f8f28da957f9e82ec121efbc6ee55241 -rac05209d7b6c65b22359754eced5ad2672d3092a
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 0fce4283f8f28da957f9e82ec121efbc6ee55241)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision ac05209d7b6c65b22359754eced5ad2672d3092a)
@@ -22,10 +22,6 @@
 #include "Buttons.h"
 #include "OperationModes.h"
 #include "ModePostTreat.h"
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "Timers.h"
-    static U32 start;
-#endif
 
 /**
  *  @addtogroup HDPostTreatmentMode
@@ -61,10 +57,6 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
-
-#ifdef RM46_EVAL_BOARD_TARGET
-    start = getMSTimerCount();
-#endif
 }
 
 /*********************************************************************//**
@@ -78,18 +70,7 @@
 {
     BOOL stop = isStopButtonPressed();
 
-#ifdef DISABLE_UI_TREATMENT_WORKFLOW
-    if ( TRUE == stop )
-#endif
-    {
-        requestNewOperationMode( MODE_STAN );
-    }
-#ifdef RM46_EVAL_BOARD_TARGET
-    if ( TRUE == didTimeout( start, 5000U ) )
-    {
-        requestNewOperationMode( MODE_STAN );
-    }
-#endif
+    requestNewOperationMode( MODE_STAN );  // TODO - implement post treatment mode
 
     return 0; // TODO - return current state
 }