Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r28cd9da453de6282baea3113cf9f787810aae1e5 -r6e7270b9f5408f602dd090eae1bf4414297a5187
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 28cd9da453de6282baea3113cf9f787810aae1e5)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6e7270b9f5408f602dd090eae1bf4414297a5187)
@@ -1145,21 +1145,15 @@
             handleUIServiceModeRequest( message );
             break;
 
-        case MSG_ID_UI_CHANGED_SCREEN_BRIGHTNESS:
-            handleUIChangedScreenBrightness( message );
-            break;
-
         // NOTE: this always must be the last case
         case MSG_ID_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
             break;
 
-#ifndef _VECTORCAST_
         // The default cannot be reached in VectorCAST since the cases are run in a for loop
         default:
             // Un-recognized or un-handled message ID received - ignore
             break;
-#endif
     }
 
     // Handle any test messages if tester has logged in successfully
@@ -1661,12 +1655,10 @@
                 handleSetBloodLeakEmbeddedModeCommand( message );
                 break;
 
-#ifndef _VECTORCAST_
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore
                 break;
-#endif
         }
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r28cd9da453de6282baea3113cf9f787810aae1e5 -r6e7270b9f5408f602dd090eae1bf4414297a5187
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 28cd9da453de6282baea3113cf9f787810aae1e5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6e7270b9f5408f602dd090eae1bf4414297a5187)
@@ -2817,30 +2817,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUIChangedScreenBrightness function handles a screen brightness change
- *  message from the UI.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleUIChangedScreenBrightness( MESSAGE_T *message )
-{
-    if ( sizeof( U32 ) == message->hdr.payloadLen )
-    {
-        U32 payload;
-
-        memcpy( &payload, &message->payload[0], sizeof( U32 ) );
-        sendTreatmentLogEventData( SCREEN_BRIGHTNESS_CHANGED_EVENT, (F32)0.0, (F32)payload );
-    }
-    else
-    {
-        sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_HD_2_UI, FALSE );
-    }
-}
-
-/*********************************************************************//**
- * @brief
  * The handleSalineBolusRequest function handles a saline bolus request
  * message from the UI.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r28cd9da453de6282baea3113cf9f787810aae1e5 -r6e7270b9f5408f602dd090eae1bf4414297a5187
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 28cd9da453de6282baea3113cf9f787810aae1e5)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6e7270b9f5408f602dd090eae1bf4414297a5187)
@@ -240,9 +240,6 @@
 // MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD
 void handleAlarmAudioVolumeSetCmd( MESSAGE_T *message );
 
-// MSG_ID_UI_CHANGED_SCREEN_BRIGHTNESS
-void handleUIChangedScreenBrightness( MESSAGE_T *message );
-
 // MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE
 BOOL sendAlarmAudioVolumeSetResponse( U32 accepted, U32 rejReason );