Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r8492830da5862d7eeaea89d30efb5ea5dcc22572 -r00f98c3a603917bb25450e7686bc75a34c357e97
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 8492830da5862d7eeaea89d30efb5ea5dcc22572)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 00f98c3a603917bb25450e7686bc75a34c357e97)
@@ -83,6 +83,12 @@
     U32 mPatientConnectionState;    ///< Current Patient Connection state.
 } PRE_TREATMENT_STATES_DATA_PAYLOAD_T;
 
+/// Payload record structure for Post-Treatment states broadcast.
+typedef struct
+{
+    U32 mSubMode;                   ///< Current Post-Treatment state.
+} POST_TREATMENT_STATES_DATA_PAYLOAD_T;
+
 /// Institutional record structure containing treatment parameter range limits.
 typedef struct
 {
@@ -144,8 +150,6 @@
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 BOOL handleUpdateAvailable( MESSAGE_T *message );
 BOOL handleUIVersionResponse( MESSAGE_T *message );
-BOOL handlePatientDisconnectionConfirmCmd( MESSAGE_T *message );
-BOOL handleDisposableRemovalConfirmCmd( MESSAGE_T *message );
 BOOL handleUIConfirmation( MESSAGE_T *message );
 
 // Test send message helper functions