Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r580a23d5d8e27f8914cbbdc8d9721ef77e16621e
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 580a23d5d8e27f8914cbbdc8d9721ef77e16621e)
@@ -402,7 +402,6 @@
             // If off request in a valid mode, send to UI for user confirmation
             userConfirmOffButton( OFF_BUTTON_RSP_USER_REQUESTS_POWER_OFF );
             // Log off button press
-            sendTreatmentLogEventData( OFF_BUTTON_PRESSED_EVENT, 0.0F, 0.0F );
             SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_OFF, BUTTON_STATE_PRESSED )
         }
         else
@@ -464,7 +463,6 @@
             stopButtonPressPending = TRUE;
             stopButtonPendingTimer = getMSTimerCount();
             // Log stop button press
-            sendTreatmentLogEventData( STOP_BUTTON_PRESSED_EVENT, 0.0F, 0.0F );
             SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BUTTON, BUTTON_STOP, BUTTON_STATE_PRESSED )
         }
         else
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r580a23d5d8e27f8914cbbdc8d9721ef77e16621e
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 580a23d5d8e27f8914cbbdc8d9721ef77e16621e)
@@ -137,17 +137,6 @@
                 // If the debounce time has been elapsed, update the switch status to the new status
                 else if ( TRUE == didTimeout( switchesStatus[ i ].debounceStartTime, SWITCHES_DEBOUNCE_TIME_MS ) )
                 {
-                    if ( FRONT_DOOR == i )
-                    {
-                        // Log front door switch change
-                        sendTreatmentLogEventData( FRONT_DOOR_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
-                    }
-                    // removed explicit check due to VectorCast coverage
-                    else
-                    {
-                        // Log pump track switch change
-                        sendTreatmentLogEventData( PUMP_TRACK_SWITCH_CHANGED_EVENT, (F32)switchesStatus[ i ].status.data, (F32)currentSwitchStatus );
-                    }
                     // If the bit is 0, the door switch is open, because it is normally open switch
                     switchesStatus[ i ].debounceStartTime = 0;
                     switchesStatus[ i ].status.data       = currentSwitchStatus;
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rb224db3ce247a1c1cb618ec63b4a97bd359a020a -r580a23d5d8e27f8914cbbdc8d9721ef77e16621e
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b224db3ce247a1c1cb618ec63b4a97bd359a020a)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 580a23d5d8e27f8914cbbdc8d9721ef77e16621e)
@@ -1086,11 +1086,6 @@
         syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
     }
 
-    // Log syringe detect switch changes
-    if ( prevSyringeDetected !=  isSyringeDetected() )
-    {
-        sendTreatmentLogEventData( SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, (F32)prevSyringeDetected, (F32)isSyringeDetected() );
-    }
     // Handle syringe detect alarm management
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r736cc5b56cc9c784ab1d8fc8687a73d190c35759 -r580a23d5d8e27f8914cbbdc8d9721ef77e16621e
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 736cc5b56cc9c784ab1d8fc8687a73d190c35759)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 580a23d5d8e27f8914cbbdc8d9721ef77e16621e)
@@ -347,10 +347,6 @@
         setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );
         setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
         setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
-        if ( isTreatmentCompleted() != TRUE )
-        {
-            sendTreatmentLogEventData( MID_TREATMENT_RINSE_BACK_EVENT, 0.0, rinsebackRate_mL_min );
-        }
         setupForRinsebackDelivery( rinsebackRate_mL_min );
         // From moment we start rinseback, we consider blood side of dialyzer no longer fully primed
         setBloodIsPrimed( FALSE );
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r5b0dbf5db226260e368f05c8abeb510b645cbf3d -r580a23d5d8e27f8914cbbdc8d9721ef77e16621e
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 5b0dbf5db226260e368f05c8abeb510b645cbf3d)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 580a23d5d8e27f8914cbbdc8d9721ef77e16621e)
@@ -864,7 +864,6 @@
 
     if ( ( volumeLevel > 0 ) && ( volumeLevel <= MAX_ALARM_VOLUME_LEVEL ) )
     {
-        sendTreatmentLogEventData( ALARM_AUDIO_VOLUME_CHANGED_EVENT, (F32)volumeLevel, (F32)getAlarmAudioVolume() );
         // Convert volume level to attenuation level
         alarmAudioVolumeLevel.data = MAX_ALARM_VOLUME_LEVEL - volumeLevel;
         accepted = TRUE;