Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r1095b811053729187a2c7535251c4a33c5d22ab5 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 1095b811053729187a2c7535251c4a33c5d22ab5)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -30,11 +30,6 @@
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "Timers.h"
-    static U32 start;
-#endif
-
 /**
  *  @addtogroup HDPreTreatmentMode
  *  @{
@@ -165,10 +160,6 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-
-#ifdef RM46_EVAL_BOARD_TARGET
-    start = getMSTimerCount();
-#endif
 }
 
 /*********************************************************************//**
@@ -187,13 +178,6 @@
         activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
     }
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    if ( TRUE == didTimeout( start, 5000U ) )
-    {
-        requestNewOperationMode( MODE_TREA );
-    }
-#else
-
     // execute mode state machine
     switch ( currentPreTreatmentState )
     {
@@ -249,7 +233,6 @@
 
     // Broadcast pre-treatment data
     publishPreTreatmentState();
-#endif
 
     return (U32)currentPreTreatmentState;
 }