Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r1095b811053729187a2c7535251c4a33c5d22ab5 -r844f98879b7425c207b58562e623ab960adbc357
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 1095b811053729187a2c7535251c4a33c5d22ab5)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 844f98879b7425c207b58562e623ab960adbc357)
@@ -34,12 +34,6 @@
 #include "Temperatures.h"
 #include "Voltages.h"
 #include "WatchdogMgmt.h"
-
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-    #include "SystemCommMessages.h"
-    static BOOL lastUserPress = FALSE;
-#endif
 
 /**
  *  @addtogroup TaskGeneral
@@ -118,23 +112,9 @@
         // Manage NVDataMgmt process record state machine
         execNVDataMgmtProcessRecord();
 
+#ifndef RM46_EVAL_BOARD_TARGET
         // Manage alarm state
         execAlarmMgmt();
-
-#ifdef RM46_EVAL_BOARD_TARGET
-        if ( getUserButtonState() == PIN_SIGNAL_LOW )
-        {
-            if ( lastUserPress == FALSE )
-            {
-                lastUserPress = TRUE;
-                setUserLED( FALSE );
-                sendOffButtonMsgToUI(TRUE);
-            }
-        }
-        else
-        {
-            lastUserPress = FALSE;
-        }
 #endif
 
         // Manage data to be transmitted to other sub-systems