diff --git a/deluge/configmanager.py b/deluge/configmanager.py
index aed3ad10e..543492f36 100644
--- a/deluge/configmanager.py
+++ b/deluge/configmanager.py
@@ -38,10 +38,11 @@ class _ConfigManager:
     def __init__(self):
         log.debug("ConfigManager started..")
         self.config_files = {}
-    
+
     def __del__(self):
+        log.debug("ConfigManager stopping..")
         del self.config_files
-        
+
     def get_config(self, config_file, defaults=None):
         """Get a reference to the Config object for this filename"""
         # Create the config object if not already created
diff --git a/deluge/core/core.py b/deluge/core/core.py
index d5d4fae48..30e4aeb3b 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -142,6 +142,8 @@ class Core(dbus.service.Object):
         del self.torrents
         self.plugins.shutdown()
         del self.plugins
+        del self.config
+        del deluge.configmanager
         del self.session
 
     @dbus.service.method(dbus_interface="org.deluge_torrent.Deluge", 
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index fb29503aa..8d6acd372 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -43,6 +43,7 @@ from signals import Signals
 from pluginmanager import PluginManager
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
+import deluge.configmanager
 
 DEFAULT_PREFS = {
     "interactive_add": False,
@@ -93,3 +94,9 @@ class GtkUI:
         
         # Start the gtk main loop
         gtk.main()
+
+        # Clean-up
+        del self.mainwindow
+        del self.signal_receiver
+        del self.plugins
+        del deluge.configmanager