Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r3a480399e9fd87f51a12a469cc56242ebeb93539 -re250309026d33ff57fd00d74ccc05b1595610656
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3a480399e9fd87f51a12a469cc56242ebeb93539)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e250309026d33ff57fd00d74ccc05b1595610656)
@@ -1417,14 +1417,6 @@
                 handleTestBloodPumpOcclusionOverrideRequest( message );
                 break;
 
-            //case MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE:
-            //    handleTestDialysateInletPumpOcclusionOverrideRequest( message );
-            //    break;
-
-            //case MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE:
-            //    handleTestDialysateOutletPumpOcclusionOverrideRequest( message );
-            //    break;
-
             case MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE:
                 handleTestPresOcclBroadcastIntervalOverrideRequest( message );
                 break;
@@ -1523,14 +1515,6 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
-            case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestBloodFlowSignalStrengthOverrideRequest( message );
-                break;
-
-            case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
-                handleTestDialInFlowSignalStrengthOverrideRequest( message );
-                break;
-
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;
@@ -1599,18 +1583,10 @@
                 handleBatteryRemainingPercentOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_BLOOD_PRIME_SAFETY_VOLUME_OVERRIDE:
-                handleBloodPrimeSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_RINSEBACK_VOLUME_OVERRIDE:
                 handleRinsebackVolumeOverrideRequest( message );
                 break;
 
-            case MSG_ID_HD_RINSEBACK_SAFETY_VOLUME_OVERRIDE:
-                handleRinsebackSafetyVolumeOverrideRequest( message );
-                break;
-
             case MSG_ID_HD_SYRINGE_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestSyringePumpDataBroadcastIntervalOverrideRequest( message );
                 break;