diff --git a/main/src/infrastructure/proto/playtime_request_handler.rs b/main/src/infrastructure/proto/playtime_request_handler.rs
index b1b0da4d..b5f31a75 100644
--- a/main/src/infrastructure/proto/playtime_request_handler.rs
+++ b/main/src/infrastructure/proto/playtime_request_handler.rs
@@ -366,30 +366,27 @@ impl PlaytimeProtoRequestHandler {
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingTrigger => {
-                matrix.toggle_learn_source_by_target(SimpleMappingTarget::TriggerMatrix);
+                matrix.remove_mapping_by_target(SimpleMappingTarget::TriggerMatrix);
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingEnterSilenceModeOrPlayIgnited => {
-                matrix.toggle_learn_source_by_target(
-                    SimpleMappingTarget::EnterSilenceModeOrPlayIgnited,
-                );
+                matrix.remove_mapping_by_target(SimpleMappingTarget::EnterSilenceModeOrPlayIgnited);
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingSmartRecord => {
-                matrix.toggle_learn_source_by_target(SimpleMappingTarget::SmartRecord);
+                matrix.remove_mapping_by_target(SimpleMappingTarget::SmartRecord);
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingSequencerPlayOnOffState => {
-                matrix.toggle_learn_source_by_target(SimpleMappingTarget::SequencerPlayOnOffState);
+                matrix.remove_mapping_by_target(SimpleMappingTarget::SequencerPlayOnOffState);
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingSequencerRecordOnOffState => {
-                matrix
-                    .toggle_learn_source_by_target(SimpleMappingTarget::SequencerRecordOnOffState);
+                matrix.remove_mapping_by_target(SimpleMappingTarget::SequencerRecordOnOffState);
                 Ok(())
             }
             TriggerMatrixAction::RemoveSimpleMappingTapTempo => {
-                matrix.toggle_learn_source_by_target(SimpleMappingTarget::TapTempo);
+                matrix.remove_mapping_by_target(SimpleMappingTarget::TapTempo);
                 Ok(())
             }
             TriggerMatrixAction::TriggerSmartRecord => matrix.trigger_smart_record(false),
diff --git a/playtime-clip-engine b/playtime-clip-engine
index e7580a98..1d49d21d 160000
--- a/playtime-clip-engine
+++ b/playtime-clip-engine
@@ -1 +1 @@
-Subproject commit e7580a98633fd845f9d7669697f7290ba1b1917d
+Subproject commit 1d49d21d5484f42f4ba35c6a3e8dcfba0222dd7c