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))