Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r78cee9347b3766ac7c14d413ed848be758c7e9cd -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 78cee9347b3766ac7c14d413ed848be758c7e9cd)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
@@ -327,14 +327,6 @@
                     {
                         canTransmit( canREG1, lastCANPacketSentChannel, lastCANPacketSent );
                     }
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD resend Last Frame. %2d\n", lastCANPacketSentChannel );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                        sendDebugDataToUI( (U08*)debugStr );
-                    }
-#endif
                 }
                 // We must be only node on CAN bus - nobody is ACKing our transmitted frames
                 else
@@ -343,13 +335,6 @@
                     canXmitRetryCtr = MAX_XMIT_RETRIES;
                     signalCANXmitsCompleted();          // Clear pending xmit flag
                     clearCANXmitBuffers();              // Clear xmit buffers - nothing is going out right now
-#ifdef DEBUG_ENABLED
-                    {
-                        char debugStr[100];
-                        sprintf( debugStr, "SystemComm-HD is only node.\n" );
-                        sendDebugData( (U08*)debugStr, strlen(debugStr) );
-                    }
-#endif
                 }
             }
         }
@@ -968,13 +953,6 @@
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
 #endif
     }
-#ifdef DEBUG_ENABLED
-    {
-        char debugStr[100];
-        sprintf( debugStr, "SystemComm-HD-Bad Msg CRC.\n" );
-        sendDebugDataToUI( (U08*)debugStr );
-    }
-#endif
 }
 
 /*********************************************************************//**
@@ -1548,6 +1526,14 @@
                 handleTestDialOutPumpHomeRequest( message );
                 break;
 
+            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
+                handleTestSuperClearAlarmsRequest( message );
+                break;
+
+            case MSG_ID_HD_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
             case MSG_ID_HD_FLUID_LEAK_SEND_INTERVAL_OVERRIDE:
                 handleSetFluidLeakBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1580,12 +1566,12 @@
                 handleBubbleSelfTestRequest( message );
                 break;
 
-            case MSG_ID_HD_SET_OP_MODE_REQUEST:
-                handleTestSetOpModeRequest( message );
+            case MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE:
+                handleBloodPrimeVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_SUPER_CLEAR_ALARMS_CMD:
-                handleTestSuperClearAlarmsRequest( message );
+            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
+                handleBloodPrimeSafetyVolumeOverrideRequest( message );
                 break;
 
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE: