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
         }
     }
 }