Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -r1631728a0f2506fb4e29c5f6c6e1a5f55018caab -rf688e0f8bded1f0a687437e3136cfba8b14f87b6
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 1631728a0f2506fb4e29c5f6c6e1a5f55018caab)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision f688e0f8bded1f0a687437e3136cfba8b14f87b6)
@@ -111,9 +111,9 @@
     ddIsCommunicating = TRUE;
     timeOfLastDGCheckIn = getMSTimerCount();
 
-    if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_COMM_TIMEOUT ) )
+    if ( TRUE == isAlarmActive( ALARM_ID_TD_DD_COMM_TIMEOUT ) )
     {
-        clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
+        clearAlarmCondition( ALARM_ID_TD_DD_COMM_TIMEOUT );
     }
 }
 
@@ -264,7 +264,7 @@
 //            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_HD_UI_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_TD_UI_COMM_TIMEOUT );
             }
         }
 
@@ -274,13 +274,13 @@
             // Only alarm on DG comm loss while in the treatment workflow
             if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
             {
-                activateAlarmNoData( ALARM_ID_HD_DG_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_TD_DD_COMM_TIMEOUT );
                 // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status
 //                setDGOpMode( DG_MODE_FAUL, 0 );
             }
             else // Otherwise clear the alarm
             {
-                clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
+                clearAlarmCondition( ALARM_ID_TD_DD_COMM_TIMEOUT );
             }
             ddIsCommunicating = FALSE;
 #endif
@@ -349,8 +349,6 @@
  *************************************************************************/
 void processReceivedMessage( MESSAGE_T *message )
 {
-    U16 msgID = message->hdr.msgID;
-
     // Handle any messages from other sub-systems
     handleIncomingMessage( message );
 }