Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r54c46e24708461130e5c86c296e347f864d4f238
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 54c46e24708461130e5c86c296e347f864d4f238)
@@ -8,7 +8,7 @@
 * @file    SystemComm.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      26-May-2022
+* @date    (last)      14-Jun-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1150,12 +1150,9 @@
             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
@@ -1361,10 +1358,6 @@
                 handleHDBloodPumpRotorCountOverrideRequest( message );
                 break;
 
-            case MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET:
-                handleHDSetArterialPressureOffsetRequest( message );
-                break;
-
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;
@@ -1657,12 +1650,9 @@
                 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
         }
     }
 }