Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5fee19014b35574d67b210f71581a6013650528e -rcc51e5f0c0b18d1011e7b4949fcffac019e09292
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5fee19014b35574d67b210f71581a6013650528e)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cc51e5f0c0b18d1011e7b4949fcffac019e09292)
@@ -763,15 +763,6 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
-            }
-        }
-
-        // Only alarm on DG comm loss while in the treatment workflow
-        if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
-        {
-            if ( TRUE == didTimeout( timeOfLastDGCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
-            {
                 activateAlarmNoData( ALARM_ID_HD_UI_COMM_TIMEOUT );
             }
         }
@@ -1760,18 +1751,6 @@
                 handleBloodPumpHardStopRequest( message );
                 break;
 
-            case MSG_ID_FW_SET_ENTER_BOOTLOADER:
-                handleSetBootloaderRequest( message );
-                break;
-
-            case MSG_ID_FW_ENTER_BOOTLOADER_NOW:
-                handleEnterBootloaderNowRequest( message );
-                break;
-
-            case MSG_ID_FW_REBOOT_NOW:
-                handleRebootNowRequest( message );
-                break;
-
             // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore