Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb14efe97c6baf3cca79d9199fd0575768262eb9f -r38b5b0408730290c3ad591711ba1613e85045cd5
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b14efe97c6baf3cca79d9199fd0575768262eb9f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 38b5b0408730290c3ad591711ba1613e85045cd5)
@@ -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,16 @@
                 handleHDSoftwareResetRequest( message );
                 break;
 
+#ifdef USE_FMB_FLOW_SENSOR
             case MSG_ID_BLOOD_FLOW_SIG_STRENGTH_OVERRIDE:
                 handleTestBloodFlowSignalStrengthOverrideRequest( message );
                 break;
-
+#endif
+#ifdef USE_FMD_FLOW_SENSOR
             case MSG_ID_DIAL_IN_FLOW_SIG_STRENGTH_OVERRIDE:
                 handleTestDialInFlowSignalStrengthOverrideRequest( message );
                 break;
-
+#endif
             case MSG_ID_BLOOD_PUMP_HOME_CMD:
                 handleTestBloodPumpHomeRequest( message );
                 break;