diff --git a/gnomemusic/albumartcache.py b/gnomemusic/albumartcache.py
index d9a1abc4a9c383bc61f7812c90d9bc8c40bf5fab..17a6965ffef17e59f762aa016606f6bd2e6e3522 100644
--- a/gnomemusic/albumartcache.py
+++ b/gnomemusic/albumartcache.py
@@ -33,7 +33,6 @@ from math import pi
 import os
 
 import cairo
-from gettext import gettext as _
 import gi
 gi.require_version('MediaArt', '2.0')
 from gi.repository import (Gdk, GdkPixbuf, Gio, GLib, GObject, Gtk, MediaArt,
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index 40146fa7222ed584edcee14b3244f3991aa4e6db..3533e9f68cfa7108e331342fee7d688abbc2b298 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -28,7 +28,6 @@ from gnomemusic.grilo import grilo
 from gnomemusic.playlists import Playlists
 import gnomemusic.utils as utils
 
-from gettext import gettext as _
 from gi.repository import GLib
 from gi.repository import Gio
 from gnomemusic import log
diff --git a/gnomemusic/notification.py b/gnomemusic/notification.py
index 2f6f7d3887378f429a0fc8751b3c30a08b7564ce..61120797c9aa673cb443a0bda83cc215a56c68aa 100644
--- a/gnomemusic/notification.py
+++ b/gnomemusic/notification.py
@@ -22,7 +22,7 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
-from gi.repository import GLib, Grl, Notify
+from gi.repository import GLib, Notify
 
 from gettext import gettext as _
 
diff --git a/gnomemusic/playlists.py b/gnomemusic/playlists.py
index 7d2ed699106b510405171ece5ced74e7b394a710..5be6ad09ec98aeeb97b264909e79497f8a8cc587 100644
--- a/gnomemusic/playlists.py
+++ b/gnomemusic/playlists.py
@@ -32,7 +32,6 @@ from gnomemusic.grilo import grilo
 from gnomemusic.query import Query
 from gettext import gettext as _
 import inspect
-import time
 sparql_dateTime_format = "%Y-%m-%dT%H:%M:%SZ"
 
 from gnomemusic import log
@@ -304,7 +303,7 @@ class Playlists(GObject.GObject):
 
         def cursor_callback(cursor, res, data):
             try:
-                has_next = cursor.next_finish(res)
+                cursor.next_finish(res)
             except GLib.Error as err:
                 logger.warn("Error: %s, %s", err.__class__, err)
                 return
diff --git a/gnomemusic/query.py b/gnomemusic/query.py
index 67c6257c2419ef39c5c8d244a4db32fbc1fe1cd5..95f26b08566f8234345efc9e391ef4c2a1200436 100644
--- a/gnomemusic/query.py
+++ b/gnomemusic/query.py
@@ -25,7 +25,6 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
-from gettext import gettext as _
 from gi.repository import GLib, Tracker
 from gnomemusic import log
 import os
diff --git a/gnomemusic/widgets/albumwidget.py b/gnomemusic/widgets/albumwidget.py
index 8d12fb9b6b590dbdd13608479bbdda3a85f83a9e..43928f0a8bbc1d885dc6a2b48422926ef4e214f5 100644
--- a/gnomemusic/widgets/albumwidget.py
+++ b/gnomemusic/widgets/albumwidget.py
@@ -23,13 +23,11 @@
 # delete this exception statement from your version.
 
 from gettext import gettext as _, ngettext
-from gi.repository import Gd, Gdk, GdkPixbuf, GLib, GObject, Gtk, Pango
+from gi.repository import GdkPixbuf, GLib, GObject, Gtk
 
 from gnomemusic import log
 from gnomemusic.albumartcache import AlbumArtCache, DefaultIcon, ArtSize
 from gnomemusic.grilo import grilo
-from gnomemusic.player import DiscoveryStatus
-from gnomemusic.playlists import Playlists
 from gnomemusic.widgets.disclistboxwidget import DiscBox, DiscListBox
 import gnomemusic.utils as utils
 
diff --git a/gnomemusic/widgets/artistalbumwidget.py b/gnomemusic/widgets/artistalbumwidget.py
index 43dd6c60dc9484c1640b41c240c89ed2ce79f4d6..11a503dd3c2a7f1ed6bde0a0963aa27b2c6415cc 100644
--- a/gnomemusic/widgets/artistalbumwidget.py
+++ b/gnomemusic/widgets/artistalbumwidget.py
@@ -22,13 +22,12 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
-from gettext import gettext as _
-from gi.repository import Gdk, Gio, GLib, GObject, Gtk
+from gi.repository import GLib, GObject, Gtk
 
 from gnomemusic import log
 from gnomemusic.albumartcache import AlbumArtCache, DefaultIcon, ArtSize
 from gnomemusic.grilo import grilo
-from gnomemusic.widgets.disclistboxwidget import DiscBox, DiscListBox
+from gnomemusic.widgets.disclistboxwidget import DiscBox
 import gnomemusic.utils as utils
 
 
diff --git a/gnomemusic/widgets/starhandlerwidget.py b/gnomemusic/widgets/starhandlerwidget.py
index 1651b2ac98508da9757d7d91fd06c82b5357a079..d8ba9713aca11fa752d20bd3b3d86ef61315097b 100644
--- a/gnomemusic/widgets/starhandlerwidget.py
+++ b/gnomemusic/widgets/starhandlerwidget.py
@@ -22,7 +22,7 @@
 # code, but you are not obligated to do so.  If you do not wish to do so,
 # delete this exception statement from your version.
 
-from gi.repository import Gdk, GObject, Gtk
+from gi.repository import GObject, Gtk
 
 from gnomemusic import log
 from gnomemusic.grilo import grilo
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 60372d76fb8edc7fdd934df2a7d00fc88179f17d..f2a474d5fa3659a9417e553cf217d3a28d5cdba5 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -30,7 +30,7 @@
 # delete this exception statement from your version.
 
 from gi.repository import Gtk, Gdk, Gio, GLib
-from gettext import gettext as _, ngettext
+from gettext import gettext as _
 
 from gnomemusic import log
 from gnomemusic import TrackerWrapper