Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r8e7d30d231de616b58a765d98495ba34010781c8
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
@@ -25,10 +25,6 @@
 #define MAX_COMM_ERRORS             5                                   ///< Maximum number of a given comm error for a given time window.
 #define COMM_ERROR_TIME_WINDOW_MS   (10 * SEC_PER_MIN * MS_PER_SECOND)  ///< Time window for comm error counts.
 
-#define HET1_EDGE_BP_ROTOR_HALL_SENSOR          0                       ///< HET1 edge detector associated with blood pump rotor hall sensor.
-#define HET1_EDGE_DPO_ROTOR_HALL_SENSOR         1                       ///< HET1 edge detector associated with dialysate outlet pump rotor hall sensor.
-#define HET1_EDGE_DPI_ROTOR_HALL_SENSOR         2                       ///< HET1 edge detector associated with dialysate inlet pump rotor hall sensor.
-
 // ********** private data **********
 
 static BOOL sci2FEOEError = FALSE;                                      ///< FPGA serial frame or overrun flag;
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r8e7d30d231de616b58a765d98495ba34010781c8
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
@@ -41,38 +41,19 @@
     COMM_BUFFER_IN_CAN_DD_BROADCAST,
     COMM_BUFFER_IN_CAN_UI_BROADCAST,
     COMM_BUFFER_OUT_CAN_RO_BROADCAST,
-    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to TD messages
-    COMM_BUFFER_NOT_USED,                                   ///< Buffer for outgoing HD to PC messages so no response buffer
+    COMM_BUFFER_OUT_CAN_PC,                                 ///< Buffer for responding to incoming PC to RO messages
 };
 
 typedef BOOL (*MsgFuncPtr)( MESSAGE_T* );
 
 /// Message handling function lookup table
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
     MSG_ID_TESTER_LOGIN_REQUEST,
-    MSG_ID_DD_SOFTWARE_RESET_REQUEST,
-    MSG_ID_TD_OP_MODE_DATA,
-    MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-    MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,
-    MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,
-    MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,
-    MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
-    &handleTesterLogInRequest,
-    &handleSetROOperationMode,
+    &handleTesterLogInRequest
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r8e7d30d231de616b58a765d98495ba34010781c8
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
@@ -33,22 +33,15 @@
 
 // Serialize message
 U32 serializeMessage( MESSAGE_T msg, COMM_BUFFER_T buffer, BOOL ackReq );
+BOOL sendACKMsg( MESSAGE_T *message );
+void handleIncomingMessage( MESSAGE_T *message );
 
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 );
-
 BOOL broadcastAlarmCleared( U32 alarm );
-
 BOOL broadcastAlarmConditionCleared( U32 alarm );
-
 BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 );
 
-void handleIncomingMessage( MESSAGE_T *message );
-
-// ACK MSG
-BOOL sendACKMsg( MESSAGE_T *message );
-
 void handleUITDResetInServiceModeRequest( MESSAGE_T* message );
-
 BOOL handleSetROOperationMode( MESSAGE_T *message );
 
 // Test Support Messaging Functions **************************
Index: firmware/App/Services/SystemCommRO.c
===================================================================
diff -u -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 -r8e7d30d231de616b58a765d98495ba34010781c8
--- firmware/App/Services/SystemCommRO.c	(.../SystemCommRO.c)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
+++ firmware/App/Services/SystemCommRO.c	(.../SystemCommRO.c)	(revision 8e7d30d231de616b58a765d98495ba34010781c8)
@@ -21,7 +21,7 @@
 
 // ********** private definitions **********
 
-#define DG_COMM_TIMEOUT_IN_MS           1000                                                       ///< DD has not checked in for this much time
+#define DD_COMM_TIMEOUT_IN_MS           1000                                        ///< DD has not checked in for this much time
 
 #define MAX_COMM_CRC_FAILURES           5                                           ///< Maximum number of CRC errors within window period before alarm
 #define MAX_COMM_CRC_FAILURE_WINDOW_MS  (10 * SEC_PER_MIN * MS_PER_SECOND)          ///< CRC error window
@@ -195,7 +195,7 @@
     {
         RO_OP_MODE_T opMode  = getCurrentOperationMode();
 
-        if ( TRUE == didTimeout( timeOfLastDDCheckIn, DG_COMM_TIMEOUT_IN_MS ) )
+        if ( TRUE == didTimeout( timeOfLastDDCheckIn, DD_COMM_TIMEOUT_IN_MS ) )
         {
 #ifndef RUN_WITHOUT_DD
             // Only alarm on DG comm loss while in the treatment workflow