diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
index 4be771a..5b14eff 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushAccount.cs
@@ -149,8 +149,6 @@ namespace Acacia.ZPush
             Confirmed = Capabilities == null ? ConfirmationType.IsNotZPush : ConfirmationType.IsZPush;
             Logger.Instance.Info(this, "ZPush confirmation: {0} -> {1}, {2}", Confirmed, Capabilities, GABFolder);
 
-            //new Thread(() => { System.Threading.Thread.Sleep(30000); _confirmedChanged?.Invoke(this); }).Start();
-            //
             _confirmedChanged?.Invoke(this);
         }
 
diff --git a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushWatcher.cs b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushWatcher.cs
index 5ad5ea5..269fb94 100644
--- a/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushWatcher.cs
+++ b/src/AcaciaZPushPlugin/AcaciaZPushPlugin/ZPush/ZPushWatcher.cs
@@ -122,19 +122,14 @@ namespace Acacia.ZPush
                         oof = connection.Execute(new ActiveSync.SettingsOOFGet());
                     }
 
-                    new Thread(() => { System.Threading.Thread.Sleep(30000);
-                        account.OnConfirmationResponse(oof.RawResponse);
-                        Explorer_SelectionChange();
-                        ThisAddIn.Instance.GetFeature<FeatureOutOfOffice>()?.OnOOFSettings(account, oof);
-                    }).Start();
-                    /*account.OnConfirmationResponse(oof.RawResponse);
+                    account.OnConfirmationResponse(oof.RawResponse);
 
                     // [ZO-109] Always update the current selection, it might have changed.
                     Explorer_SelectionChange();
 
                     // Notify the OOF feature.
                     // TODO: this coupling is pretty hideous
-                    ThisAddIn.Instance.GetFeature<FeatureOutOfOffice>()?.OnOOFSettings(account, oof);*/
+                    ThisAddIn.Instance.GetFeature<FeatureOutOfOffice>()?.OnOOFSettings(account, oof);
                 });
             }
             else