diff --git a/debian/changelog b/debian/changelog
index ae8c766..cb533cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-shell-extension-zorin-taskbar (68.5.1) noble; urgency=medium
+
+  * Minor code cleanups
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Tue, 05 Aug 2025 22:47:20 +0100
+
 gnome-shell-extension-zorin-taskbar (68.5) noble; urgency=medium
 
   * Rebased on upstream commit 16e16c11ce08abc3c9f0bf922bbc08e17b2c1f08
diff --git a/src/extension.js b/src/extension.js
index 336a850..f9b9da6 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -36,7 +36,6 @@ const ZORIN_DASH_UUID = 'zorin-dash@zorinos.com'
 export const ZORIN_TILING_SHELL_UUID = 'zorin-tiling-shell@zorinos.com'
 
 let panelManager
-let startupCompleteHandler
 let zorinDashDelayId = 0
 
 export let DTP_EXTENSION = null
@@ -122,26 +121,25 @@ export default class ZorinTaskbarExtension extends Extension {
 
   disable() {
     if (zorinDashDelayId) GLib.Source.remove(zorinDashDelayId)
+    zorinDashDelayId = 0
 
-    panelManager.disable()
+    panelManager?.disable()
 
     DTP_EXTENSION = null
     SETTINGS = null
+    TILINGSETTINGS = null
     SHELLSETTINGS = null
     DESKTOPSETTINGS = null
     TERMINALSETTINGS = null
+    NOTIFICATIONSSETTINGS = null
     panelManager = null
+    tracker = null
 
     delete global.zorinTaskbar
 
     this.disableGlobalStyles()
 
     AppIcons.resetRecentlyClickedApp()
-
-    if (startupCompleteHandler) {
-      Main.layoutManager.disconnect(startupCompleteHandler)
-      startupCompleteHandler = null
-    }
   }
 
   resetGlobalStyles() {