diff --git a/gajim/app_actions.py b/gajim/app_actions.py
index 67cf5bef8..7aa35bcc1 100644
--- a/gajim/app_actions.py
+++ b/gajim/app_actions.py
@@ -18,9 +18,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import sys
-import os
-
 from gi.repository import Gtk
 
 from gajim.common import app
diff --git a/gajim/chat_control.py b/gajim/chat_control.py
index 634ace5a8..83b63c867 100644
--- a/gajim/chat_control.py
+++ b/gajim/chat_control.py
@@ -39,22 +39,18 @@ from gajim import gui_menu_builder
 from gajim import message_control
 from gajim import dialogs
 
-from gajim.common import logger
 from gajim.common import app
 from gajim.common import helpers
-from gajim.common import exceptions
 from gajim.common import ged
 from gajim.common import i18n
 from gajim.common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession
 from gajim.common.contacts import GC_Contact
 from gajim.common.logger import KindConstant
 from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC
-from nbxmpp.protocol import NS_ESESSION
 from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO
 from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5
 from nbxmpp.protocol import NS_CHATSTATES
 from gajim.common.connection_handlers_events import MessageOutgoingEvent
-from gajim.common.exceptions import GajimGeneralException
 from gajim.common.const import AvatarSize
 
 from gajim.command_system.implementation.hosts import ChatCommands
diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py
index 138b69eca..1b4c18ba2 100644
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -27,7 +27,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import os
 import time
 from gi.repository import Gtk
 from gi.repository import Gdk
diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index 0935079f4..1d6179e38 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -31,13 +31,11 @@ from threading import Timer # for smooth scrolling
 
 from gi.repository import Gtk
 from gi.repository import Gdk
-from gi.repository import GdkPixbuf
 from gi.repository import Pango
 from gi.repository import GObject
 from gi.repository import GLib
 import time
 import os
-from gajim import tooltips
 from gajim import dialogs
 import queue
 import urllib
@@ -51,7 +49,6 @@ from gajim.common.fuzzyclock import FuzzyClock
 from gajim import emoticons
 
 from gajim.htmltextview import HtmlTextView
-from gajim.common.exceptions import GajimGeneralException
 
 NOT_SHOWN = 0
 ALREADY_RECEIVED = 1
diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py
index 702282de1..e5ddf4002 100644
--- a/gajim/dataforms_widget.py
+++ b/gajim/dataforms_widget.py
@@ -33,7 +33,6 @@ from gi.repository import GLib
 import base64
 
 from gajim import gtkgui_helpers
-from gajim import dialogs
 
 from gajim.common import dataforms
 from gajim.common import helpers
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index 321b6c617..ca210c5db 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -27,7 +27,6 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-import os
 import time
 import locale
 
diff --git a/gajim/gtkgui_helpers.py b/gajim/gtkgui_helpers.py
index 5318b23bf..915160470 100644
--- a/gajim/gtkgui_helpers.py
+++ b/gajim/gtkgui_helpers.py
@@ -84,7 +84,7 @@ def get_icon_path(icon_name, size=16):
     except GLib.GError as e:
         log.error("Unable to find icon %s: %s" % (icon_name, str(e)))
 
-from gajim import vcard
+
 from gajim import dialogs
 
 
diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py
index 21227988e..d79066013 100644
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -38,7 +38,6 @@ import os
 import sys
 import re
 import time
-import math
 import hashlib
 
 from gi.repository import Gtk
diff --git a/gajim/profile_window.py b/gajim/profile_window.py
index 5fb1c1458..2bf9bbfa9 100644
--- a/gajim/profile_window.py
+++ b/gajim/profile_window.py
@@ -27,14 +27,11 @@ from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import GdkPixbuf
 import base64
-import os
 import time
 import logging
-import hashlib
 
 from gajim import gtkgui_helpers
 from gajim import dialogs
-from gajim import vcard
 from gajim.common.const import AvatarSize
 
 from gajim.common import app
diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index b39ca7631..e0cdfd6c8 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -43,7 +43,6 @@ import os
 import sys
 import time
 import locale
-import hashlib
 
 from enum import IntEnum, unique
 
diff --git a/gajim/vcard.py b/gajim/vcard.py
index d4b839ef5..4f72e6cfb 100644
--- a/gajim/vcard.py
+++ b/gajim/vcard.py
@@ -37,10 +37,7 @@ from gi.repository import Gdk
 from gi.repository import GdkPixbuf
 import base64
 import binascii
-import time
-import locale
 import os
-# import logging
 
 from gajim import gtkgui_helpers