diff --git a/src/common/connection.py b/src/common/connection.py
index 12cbf1b7c..4113a5286 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -56,8 +56,6 @@ from string import Template
 import logging
 log = logging.getLogger('gajim.c.connection')
 
-import gtkgui_helpers
-
 ssl_error = {
 2: _("Unable to get issuer certificate"),
 3: _("Unable to get certificate CRL"),
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index c1b3ca99f..27a5ffb80 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -1281,7 +1281,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			reply.setType('error')
 
 			reply.addChild(feature)
-			reply.addChild(node=xmpp.ErrorNode('service-unavailable', typ='cancel'))
+			reply.addChild(node=common.xmpp.ErrorNode('service-unavailable', typ='cancel'))
 
 			con.send(reply)
 		
diff --git a/src/common/pubsub.py b/src/common/pubsub.py
index 1cead4d4c..50249cc9e 100644
--- a/src/common/pubsub.py
+++ b/src/common/pubsub.py
@@ -1,6 +1,5 @@
 import xmpp
 import gajim
-import dataforms
 import connection_handlers
 
 class ConnectionPubSub:
@@ -61,7 +60,7 @@ class ConnectionPubSub:
 		if configure:
 			conf = c.addChild('configure')
 			if configure_form is not None:
-				conf.addChild(node=configuration_form)
+				conf.addChild(node=configure_form)
 
 		self.connection.send(query)
 
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 506f280ec..84034dc9e 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -1,7 +1,6 @@
 from common import gajim
 
 from common import xmpp
-from common import helpers
 from common import exceptions
 
 import random
diff --git a/src/disco.py b/src/disco.py
index 28ff7b2a0..cc4368b47 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -46,7 +46,6 @@ import inspect
 import weakref
 import gobject
 import gtk
-import gobject
 import pango
 
 import dialogs
diff --git a/src/features_window.py b/src/features_window.py
index 7e2d92c1b..2403c2a43 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -21,7 +21,6 @@
 import os
 import sys
 import gtk
-import gobject
 import gtkgui_helpers
 
 import dialogs
diff --git a/src/gajim.py b/src/gajim.py
index 83484a666..77f0ff19a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -44,7 +44,6 @@ if os.name == 'nt':
 #	os.environ['GTK_BASEPATH'] = 'gtk'
 
 import sys
-import urllib
 
 import logging
 consoleloghandler = logging.StreamHandler()
@@ -222,7 +221,6 @@ import gobject
 
 import re
 import signal
-import getopt
 import time
 import math
 
diff --git a/src/lastfm.py b/src/lastfm.py
index 385407f13..a247ef5a4 100644
--- a/src/lastfm.py
+++ b/src/lastfm.py
@@ -25,7 +25,7 @@ __version__ = '$Revision: 64 $'
 
 from urllib import urlopen
 from xml.dom import minidom
-from time import time, strftime
+from time import time
 
 class LastFM:
 	# Where to fetch the played song information
diff --git a/src/roster_window.py b/src/roster_window.py
index 4c9fc7a7c..5fd22857c 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -30,7 +30,6 @@ import gobject
 import os
 import sys
 import time
-import urllib
 
 import common.sleepy
 import history_window