Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r0c3720e7797f056a490cf8dd1880e34ac5ede37c -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 0c3720e7797f056a490cf8dd1880e34ac5ede37c)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -61,7 +61,7 @@
 static U32 pressuresDataPublicationTimerCounter = 0;                            ///< used to schedule pressure data publication to CAN bus.
 
 static OVERRIDE_U32_T pressuresDataPublishInterval = { PRESSURES_DATA_PUB_INTERVAL, PRESSURES_DATA_PUB_INTERVAL, 0, 0 }; ///< interval (in ms/task interval) at which to publish pressures data to CAN bus.
-static OVERRIDE_F32_T pressures[ NUM_OF_PRESSURE_SENSORS ];                     ///< Measured weight from load cells.
+static OVERRIDE_F32_T pressures[ NUM_OF_PRESSURE_SENSORS ];                     ///< Measured pressure from sensors.
 
 static PRESSURE_SELF_TEST_STATE_T pressuresSelfTestState = PRESSURE_SELF_TEST_STATE_START;  ///< current pressure self test state.
 static U32 pressuresSelfTestTimerCount = 0;                                     ///< timer counter for pressure self test.
Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -r216bd924f989182e648ee5f33f4c91c43ac438ac -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 216bd924f989182e648ee5f33f4c91c43ac438ac)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -45,36 +45,6 @@
 #define SET_RED()          {mibspiREG5->PC3 |= LAMP_RED_SPI5_PORT_MASK;}
 #define CLR_RED()          {mibspiREG5->PC3 &= ~LAMP_RED_SPI5_PORT_MASK;}
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    // for RM46 eval board, user button B uses the MIBSPI1_nCS[4] pin, so need to re-purpose that pin as GPIO to see the button
-    #define USER_BUTTON_MASK            0x00000010  // (nCS[4]
-    #define GET_USER_BUTTON()           ( PIN_SIGNAL_STATE_T )( ( ( mibspiREG1->PC2 & USER_BUTTON_MASK ) == 0 ? PIN_SIGNAL_LOW : PIN_SIGNAL_HIGH ) )
-    PIN_SIGNAL_STATE_T getUserButtonState( void )
-    {
-        PIN_SIGNAL_STATE_T result = GET_USER_BUTTON();
-
-        return result;
-    }
-    // for RM46 eval board, user LED A uses the same GPIO pin that CPLD uses for watchdog pet. Had to disable watchdog pet to use as LED.
-    void setUserLED( BOOL on )
-    {
-        if ( on == TRUE )
-        {
-            SET_WD_PET();
-        }
-        else
-        {
-            CLR_WD_PET();
-        }
-    }
-
-    void toggleUserLED()
-    {
-        TGL_WD_PET();
-    }
-
-#endif
-
 /*************************************************************************
  * @brief initCPLD
  * The initCPLD function initializes the CPLD module.
Index: firmware/App/Drivers/CPLD.h
===================================================================
diff -u -r216bd924f989182e648ee5f33f4c91c43ac438ac -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 216bd924f989182e648ee5f33f4c91c43ac438ac)
+++ firmware/App/Drivers/CPLD.h	(.../CPLD.h)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -30,10 +30,4 @@
 void setCPLDLampBlue( PIN_SIGNAL_STATE_T level );
 void setCPLDLampRed( PIN_SIGNAL_STATE_T level );
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    PIN_SIGNAL_STATE_T getUserButtonState( void );
-    void setUserLED( BOOL on );
-    void toggleUserLED();
 #endif
-
-#endif
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -19,10 +19,6 @@
 #include "Timers.h"
 #include "ModeFill.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-#endif
-
 /**
  *  @addtogroup FillMode
  *  @{
Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -re5c9e31c2644c7f0ca17ba81767a8ed19b99cebf -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision e5c9e31c2644c7f0ca17ba81767a8ed19b99cebf)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -21,10 +21,6 @@
 #include "Timers.h"
 #include "ModeRecirculate.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-#endif
-
 /**
  *  @addtogroup RecirculateMode
  *  @{
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r00c9d70ee1398f0c6db39a011220f830db92cfd3 -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 00c9d70ee1398f0c6db39a011220f830db92cfd3)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -29,10 +29,6 @@
 #include "Utilities.h"
 #include "SystemCommMessages.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-#endif
-
 // ********** private definitions **********
 
 #define NUM_OF_CAN_OUT_BUFFERS          4       // # of CAN buffers for transmit
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rf43eb1e9e0803776ec7420b16e1db8760b020bd9 -r69a52d3eafb8667fa3163949107a9351b8eb855a
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision f43eb1e9e0803776ec7420b16e1db8760b020bd9)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 69a52d3eafb8667fa3163949107a9351b8eb855a)
@@ -270,10 +270,8 @@
  *************************************************************************/
 static void petWatchdog( void )
 {
-#ifndef RM46_EVAL_BOARD_TARGET
     // pulse the watchdog signal
     toggleCPLDWatchdog();
-#endif
 
     // remember when we last pet the watchdog
     lastWatchdogPetTime = getMSTimerCount();