diff --git a/ViMac-Swift/AppDelegate.swift b/ViMac-Swift/AppDelegate.swift
index 540cf0d..3837294 100644
--- a/ViMac-Swift/AppDelegate.swift
+++ b/ViMac-Swift/AppDelegate.swift
@@ -185,13 +185,7 @@ import Preferences
         _ = self.compositeDisposable.insert(
             frontmostAppChange.onlyWhen(isAXManualAccessibilityEnabled)
                 .observeOn(axWorker)
-                .subscribe(onNext: { (__previousApp, currentApp) in
-                    if let _previousApp = __previousApp {
-                        if let previousApp = _previousApp {
-                            AXManualAccessibilityActivator.deactivate(previousApp)
-                        }
-                    }
-
+                .subscribe(onNext: { (_, currentApp) in
                     if let currentApp = currentApp {
                         AXManualAccessibilityActivator.activate(currentApp)
                     }
@@ -214,13 +208,7 @@ import Preferences
         _ = self.compositeDisposable.insert(
             frontmostAppChange.onlyWhen(isAXEnhancedUserInterfaceEnabled)
                 .observeOn(axWorker)
-                .subscribe(onNext: { (__previousApp, currentApp) in
-                    if let _previousApp = __previousApp {
-                        if let previousApp = _previousApp {
-                            AXEnhancedUserInterfaceActivator.deactivate(previousApp)
-                        }
-                    }
-
+                .subscribe(onNext: { (_, currentApp) in
                     if let currentApp = currentApp {
                         AXEnhancedUserInterfaceActivator.activate(currentApp)
                     }