diff --git a/.travis.yml b/.travis.yml
index c38851a2..7e998afc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,5 +10,4 @@ install:
     - python3 tools/localdepends.py
 script:
     - pycodestyle share src/gpodder tools bin/* *.py
-    - isort -c -rc
     - make releasetest
diff --git a/bin/gpodder b/bin/gpodder
index 54a19553..10c9e8f5 100755
--- a/bin/gpodder
+++ b/bin/gpodder
@@ -33,6 +33,7 @@ import os.path
 import platform
 import subprocess
 import sys
+from optparse import OptionParser
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +47,6 @@ except ImportError:
     """, file=sys.stderr)
     have_dbus = False
 
-from optparse import OptionParser
 
 
 def main():
@@ -79,7 +79,7 @@ def main():
     # Set up the path to translation files
     gettext.bindtextdomain('gpodder', locale_dir)
 
-    import gpodder
+    import gpodder  # isort:skip
 
     gpodder.prefix = prefix
 
diff --git a/share/gpodder/examples/gpodder_mark_played.py b/share/gpodder/examples/gpodder_mark_played.py
index 1157ea4b..c0100243 100644
--- a/share/gpodder/examples/gpodder_mark_played.py
+++ b/share/gpodder/examples/gpodder_mark_played.py
@@ -15,6 +15,10 @@
 import os
 import sys
 
+import dbus
+
+import gpodder
+
 if len(sys.argv) != 2:
     print("""
     Usage: %s /path/to/episode.mp3
@@ -23,8 +27,6 @@ if len(sys.argv) != 2:
 
 filename = os.path.abspath(sys.argv[1])
 
-import dbus
-import gpodder
 
 session_bus = dbus.SessionBus()
 proxy = session_bus.get_object(gpodder.dbus_bus_name,
diff --git a/share/gpodder/extensions/gtk_statusicon.py b/share/gpodder/extensions/gtk_statusicon.py
index 3f769fc6..425d8c9f 100644
--- a/share/gpodder/extensions/gtk_statusicon.py
+++ b/share/gpodder/extensions/gtk_statusicon.py
@@ -22,8 +22,6 @@ __category__ = 'desktop-integration'
 __only_for__ = 'gtk'
 __disable_in__ = 'unity,win32,python3'
 
-
-
 DefaultConfig = {
     'download_progress_bar': False,  # draw progress bar on icon while downloading?
 }
diff --git a/share/gpodder/extensions/notification-win32.py b/share/gpodder/extensions/notification-win32.py
index 3502566f..ef68745f 100755
--- a/share/gpodder/extensions/notification-win32.py
+++ b/share/gpodder/extensions/notification-win32.py
@@ -55,8 +55,6 @@ import gpodder
 
 gi.require_version('Gtk', '3.0')
 
-
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/share/gpodder/extensions/sonos.py b/share/gpodder/extensions/sonos.py
index 4b90bf68..260a60d8 100644
--- a/share/gpodder/extensions/sonos.py
+++ b/share/gpodder/extensions/sonos.py
@@ -16,8 +16,6 @@ _ = gpodder.gettext
 
 logger = logging.getLogger(__name__)
 
-
-
 __title__ = _('Stream to Sonos')
 __description__ = _('Stream podcasts to Sonos speakers')
 __authors__ = 'Stefan Kögl <stefan@skoegl.net>'
diff --git a/share/gpodder/extensions/taskbar_progress.py b/share/gpodder/extensions/taskbar_progress.py
index 70039c45..7b2d55c5 100755
--- a/share/gpodder/extensions/taskbar_progress.py
+++ b/share/gpodder/extensions/taskbar_progress.py
@@ -38,8 +38,6 @@ __authors__ = 'Sean Munkel <seanmunkel@gmail.com>'
 __category__ = 'desktop-integration'
 __only_for__ = 'win32'
 
-
-
 logger = logging.getLogger(__name__)
 
 WSTRING = c_wchar_p
diff --git a/share/gpodder/extensions/ubuntu_appindicator.py b/share/gpodder/extensions/ubuntu_appindicator.py
index e8efb5a5..d6407f97 100644
--- a/share/gpodder/extensions/ubuntu_appindicator.py
+++ b/share/gpodder/extensions/ubuntu_appindicator.py
@@ -20,9 +20,6 @@ __only_for__ = 'gtk'
 __mandatory_in__ = 'unity'
 __disable_in__ = 'win32'
 
-
-
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/src/gpodder/coverart.py b/src/gpodder/coverart.py
index 96602c57..208137cf 100644
--- a/src/gpodder/coverart.py
+++ b/src/gpodder/coverart.py
@@ -34,8 +34,6 @@ _ = gpodder.gettext
 logger = logging.getLogger(__name__)
 
 
-
-
 class CoverDownloader(object):
     # File name extension dict, lists supported cover art extensions
     # Values: functions that check if some data is of that file type
diff --git a/src/gpodder/dbsqlite.py b/src/gpodder/dbsqlite.py
index 7d4f2ca4..fcba2c23 100644
--- a/src/gpodder/dbsqlite.py
+++ b/src/gpodder/dbsqlite.py
@@ -35,13 +35,9 @@ from gpodder import schema, util
 
 _ = gpodder.gettext
 
-
-
 logger = logging.getLogger(__name__)
 
 
-
-
 class Database(object):
     TABLE_PODCAST = 'podcast'
     TABLE_EPISODE = 'episode'
diff --git a/src/gpodder/directory.py b/src/gpodder/directory.py
index dc3f2778..a987fca1 100644
--- a/src/gpodder/directory.py
+++ b/src/gpodder/directory.py
@@ -35,8 +35,6 @@ from gpodder import opml, util
 _ = gpodder.gettext
 
 
-
-
 class DirectoryEntry(object):
     def __init__(self, title, url, image=None, subscribers=-1, description=None):
         self.title = title
diff --git a/src/gpodder/download.py b/src/gpodder/download.py
index 6be7a65b..c667178a 100644
--- a/src/gpodder/download.py
+++ b/src/gpodder/download.py
@@ -45,11 +45,6 @@ from gpodder import escapist_videos, util, vimeo, youtube
 
 logger = logging.getLogger(__name__)
 
-
-
-
-
-
 _ = gpodder.gettext
 
 
diff --git a/src/gpodder/escapist_videos.py b/src/gpodder/escapist_videos.py
index 792a764f..08295efc 100644
--- a/src/gpodder/escapist_videos.py
+++ b/src/gpodder/escapist_videos.py
@@ -36,7 +36,6 @@ from gpodder import util
 logger = logging.getLogger(__name__)
 
 
-
 # This matches the more reliable URL
 ESCAPIST_NUMBER_RE = re.compile(r'http://www.escapistmagazine.com/videos/view/(\d+)', re.IGNORECASE)
 # This matches regular URL, mainly those that come in the RSS feeds
diff --git a/src/gpodder/gtkui/desktop/channel.py b/src/gpodder/gtkui/desktop/channel.py
index 6c076d84..bcdd8717 100644
--- a/src/gpodder/gtkui/desktop/channel.py
+++ b/src/gpodder/gtkui/desktop/channel.py
@@ -26,8 +26,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
 _ = gpodder.gettext
 
 
-
-
 class gPodderChannel(BuilderWidget):
     MAX_SIZE = 120
 
diff --git a/src/gpodder/gtkui/desktop/episodeselector.py b/src/gpodder/gtkui/desktop/episodeselector.py
index e1e572ce..09196428 100644
--- a/src/gpodder/gtkui/desktop/episodeselector.py
+++ b/src/gpodder/gtkui/desktop/episodeselector.py
@@ -27,8 +27,6 @@ _ = gpodder.gettext
 N_ = gpodder.ngettext
 
 
-
-
 class gPodderEpisodeSelector(BuilderWidget):
     """Episode selection dialog
 
diff --git a/src/gpodder/gtkui/desktop/podcastdirectory.py b/src/gpodder/gtkui/desktop/podcastdirectory.py
index 7fc9860d..40a12d96 100644
--- a/src/gpodder/gtkui/desktop/podcastdirectory.py
+++ b/src/gpodder/gtkui/desktop/podcastdirectory.py
@@ -41,8 +41,6 @@ _ = gpodder.gettext
 logger = logging.getLogger(__name__)
 
 
-
-
 class DirectoryPodcastsModel(Gtk.ListStore):
     C_SELECTED, C_MARKUP, C_TITLE, C_URL = list(range(4))
 
diff --git a/src/gpodder/gtkui/desktop/preferences.py b/src/gpodder/gtkui/desktop/preferences.py
index e6902d27..21bcc3cb 100644
--- a/src/gpodder/gtkui/desktop/preferences.py
+++ b/src/gpodder/gtkui/desktop/preferences.py
@@ -31,14 +31,10 @@ from gpodder.gtkui.interface.configeditor import gPodderConfigEditor
 
 logger = logging.getLogger(__name__)
 
-
 _ = gpodder.gettext
 N_ = gpodder.ngettext
 
 
-
-
-
 class NewEpisodeActionList(Gtk.ListStore):
     C_CAPTION, C_AUTO_DOWNLOAD = list(range(2))
 
diff --git a/src/gpodder/gtkui/desktop/welcome.py b/src/gpodder/gtkui/desktop/welcome.py
index a5a459eb..ac5723a0 100644
--- a/src/gpodder/gtkui/desktop/welcome.py
+++ b/src/gpodder/gtkui/desktop/welcome.py
@@ -25,7 +25,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
 _ = gpodder.gettext
 
 
-
 class gPodderWelcome(BuilderWidget):
     PADDING = 10
 
diff --git a/src/gpodder/gtkui/draw.py b/src/gpodder/gtkui/draw.py
index 9e60c509..122440ca 100644
--- a/src/gpodder/gtkui/draw.py
+++ b/src/gpodder/gtkui/draw.py
@@ -35,9 +35,6 @@ import gpodder
 gi.require_version('PangoCairo', '1.0')
 
 
-
-
-
 class TextExtents(object):
     def __init__(self, ctx, text):
         tuple = ctx.text_extents(text)
diff --git a/src/gpodder/gtkui/interface/addpodcast.py b/src/gpodder/gtkui/interface/addpodcast.py
index b3265d69..815c0d4c 100644
--- a/src/gpodder/gtkui/interface/addpodcast.py
+++ b/src/gpodder/gtkui/interface/addpodcast.py
@@ -26,8 +26,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
 _ = gpodder.gettext
 
 
-
-
 class gPodderAddPodcast(BuilderWidget):
     def new(self):
         if not hasattr(self, 'add_podcast_list'):
diff --git a/src/gpodder/gtkui/interface/common.py b/src/gpodder/gtkui/interface/common.py
index 3290bc1b..d9c5bcbc 100644
--- a/src/gpodder/gtkui/interface/common.py
+++ b/src/gpodder/gtkui/interface/common.py
@@ -29,8 +29,6 @@ from gpodder.gtkui.base import GtkBuilderWidget
 _ = gpodder.gettext
 
 
-
-
 class BuilderWidget(GtkBuilderWidget):
     def __init__(self, parent, **kwargs):
         self._window_iconified = False
diff --git a/src/gpodder/gtkui/interface/configeditor.py b/src/gpodder/gtkui/interface/configeditor.py
index c3c1957a..05a4488f 100644
--- a/src/gpodder/gtkui/interface/configeditor.py
+++ b/src/gpodder/gtkui/interface/configeditor.py
@@ -28,8 +28,6 @@ from gpodder.gtkui.interface.common import BuilderWidget
 _ = gpodder.gettext
 
 
-
-
 class gPodderConfigEditor(BuilderWidget):
     def new(self):
         name_column = Gtk.TreeViewColumn(_('Setting'))
diff --git a/src/gpodder/gtkui/interface/progress.py b/src/gpodder/gtkui/interface/progress.py
index 6ee9c0bf..24aece69 100644
--- a/src/gpodder/gtkui/interface/progress.py
+++ b/src/gpodder/gtkui/interface/progress.py
@@ -25,7 +25,6 @@ from gpodder.gtkui.widgets import SpinningProgressIndicator
 _ = gpodder.gettext
 
 
-
 class ProgressIndicator(object):
     # Delayed time until window is shown (for short operations)
     DELAY = 500
diff --git a/src/gpodder/gtkui/main.py b/src/gpodder/gtkui/main.py
index 019e1eed..c731604b 100644
--- a/src/gpodder/gtkui/main.py
+++ b/src/gpodder/gtkui/main.py
@@ -68,23 +68,12 @@ from gpodder.model import PodcastEpisode, check_root_folder_path
 
 gi.require_version('Gtk', '3.0')
 
-
-
-
-
 logger = logging.getLogger(__name__)
 
 _ = gpodder.gettext
 N_ = gpodder.ngettext
 
 
-
-
-
-
-
-
-
 class gPodder(BuilderWidget, dbus.service.Object):
     # Width (in pixels) of episode list icon
     EPISODE_LIST_ICON_WIDTH = 40
diff --git a/src/gpodder/gtkui/model.py b/src/gpodder/gtkui/model.py
index 28a5e87d..56a6e757 100644
--- a/src/gpodder/gtkui/model.py
+++ b/src/gpodder/gtkui/model.py
@@ -37,11 +37,9 @@ from gpodder.gtkui import draw
 
 _ = gpodder.gettext
 
-
 logger = logging.getLogger(__name__)
 
 
-
 try:
     from gi.repository import Gio
     have_gio = True
diff --git a/src/gpodder/gtkui/services.py b/src/gpodder/gtkui/services.py
index 94a346ad..5625b265 100644
--- a/src/gpodder/gtkui/services.py
+++ b/src/gpodder/gtkui/services.py
@@ -33,12 +33,9 @@ from gpodder.services import ObservableService
 
 _ = gpodder.gettext
 
-
 logger = logging.getLogger(__name__)
 
 
-
-
 class CoverDownloader(ObservableService):
     """
     This class manages downloading cover art and notification
diff --git a/src/gpodder/model.py b/src/gpodder/model.py
index b784bf44..aa1fef18 100644
--- a/src/gpodder/model.py
+++ b/src/gpodder/model.py
@@ -42,8 +42,6 @@ from gpodder import (coverart, escapist_videos, feedcore, schema, util, vimeo,
 
 logger = logging.getLogger(__name__)
 
-
-
 _ = gpodder.gettext
 
 
diff --git a/src/gpodder/my.py b/src/gpodder/my.py
index fc25b3c5..2b1bbb4f 100644
--- a/src/gpodder/my.py
+++ b/src/gpodder/my.py
@@ -36,6 +36,8 @@ import gpodder
 # Append gPodder's user agent to mygpoclient's user agent
 import mygpoclient
 from gpodder import minidb, util
+from mygpoclient import api, public
+from mygpoclient import util as mygpoutil
 
 _ = gpodder.gettext
 
@@ -68,11 +70,6 @@ except ImportError:
     MissingCredentials = object()
 
 
-from mygpoclient import api
-from mygpoclient import public
-
-from mygpoclient import util as mygpoutil
-
 EPISODE_ACTIONS_BATCH_SIZE = 100
 
 
diff --git a/src/gpodder/opml.py b/src/gpodder/opml.py
index c088ed12..3157d0ba 100644
--- a/src/gpodder/opml.py
+++ b/src/gpodder/opml.py
@@ -47,10 +47,6 @@ from gpodder import util
 logger = logging.getLogger(__name__)
 
 
-
-
-
-
 class Importer(object):
     """
     Helper class to import an OPML feed from protocols
diff --git a/src/gpodder/services.py b/src/gpodder/services.py
index 89b2f101..49ada8b1 100644
--- a/src/gpodder/services.py
+++ b/src/gpodder/services.py
@@ -30,7 +30,6 @@ from gpodder import util
 _ = gpodder.gettext
 
 
-
 class ObservableService(object):
     def __init__(self, signal_names=[]):
         self.observers = {}
diff --git a/src/gpodder/util.py b/src/gpodder/util.py
index 29876059..12a10a61 100644
--- a/src/gpodder/util.py
+++ b/src/gpodder/util.py
@@ -65,10 +65,6 @@ import gpodder
 logger = logging.getLogger(__name__)
 
 
-
-
-
-
 if sys.hexversion < 0x03000000:
     from html.parser import HTMLParser
     from html.entities import name2codepoint
diff --git a/src/gpodder/vimeo.py b/src/gpodder/vimeo.py
index ac483236..65e2a095 100644
--- a/src/gpodder/vimeo.py
+++ b/src/gpodder/vimeo.py
@@ -32,11 +32,9 @@ from gpodder import util
 
 _ = gpodder.gettext
 
-
 logger = logging.getLogger(__name__)
 
 
-
 VIMEOCOM_RE = re.compile(r'http[s]?://vimeo\.com/(channels/[^/]+|\d+)$', re.IGNORECASE)
 VIMEOCOM_VIDEO_RE = re.compile(r'http[s]?://vimeo.com/channels/(?:[^/])+/(\d+)$', re.IGNORECASE)
 MOOGALOOP_RE = re.compile(r'http[s]?://vimeo\.com/moogaloop\.swf\?clip_id=(\d+)$', re.IGNORECASE)
diff --git a/tools/progressbar_icon_tester.py b/tools/progressbar_icon_tester.py
index 7ffea02b..ffa4a0f5 100644
--- a/tools/progressbar_icon_tester.py
+++ b/tools/progressbar_icon_tester.py
@@ -14,8 +14,6 @@ from gpodder.gtkui.draw import draw_cake_pixbuf
 sys.path.insert(0, 'src')
 
 
-
-
 def gen(percentage):
     pixbuf = draw_cake_pixbuf(percentage)
     return Gtk.Image.new_from_pixbuf(pixbuf)