diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 24f5a1918..d8e4d7d02 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -24,7 +24,7 @@ import sha
 import socket
 import sys
 
-from time import localtime, strftime, gmtime, timezone
+from time import localtime, strftime, gmtime
 from calendar import timegm
 
 import socks5
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 37a5dc8d5..119d0b70f 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -13,7 +13,6 @@
 ##
 
 import os
-import sys
 import locale
 from common import gajim
 
diff --git a/src/common/passwords.py b/src/common/passwords.py
index 5d556b6a8..badabce11 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -14,8 +14,6 @@
 
 __all__ = ['get_password', 'save_password']
 
-import gobject
-
 from common import gajim
 
 USER_HAS_GNOMEKEYRING = False
diff --git a/src/remote_control.py b/src/remote_control.py
index ea159377e..be3ec6622 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -594,7 +594,7 @@ class SignalObject(dbus.service.Object):
 				gajim.connections[acc].send_stanza(xml)
 
 	@dbus.service.method(INTERFACE, in_signature='ssss', out_signature='')
-	def join_room(self, room_jid, nick, passwd, account):
+	def join_room(self, room_jid, nick, password, account):
 		if not account:
 			# get the first connected account
 			accounts = gajim.connections.keys()