diff --git a/src/pretix/base/tests/test_models.py b/src/pretix/base/tests/test_models.py
index b924b94c9..e49bf6279 100644
--- a/src/pretix/base/tests/test_models.py
+++ b/src/pretix/base/tests/test_models.py
@@ -5,8 +5,7 @@ from django.utils.timezone import now
 from pretix.base.models import (
     Event, Organizer, Item, ItemVariation,
     Property, PropertyValue, User, Quota,
-    Order, OrderPosition, CartPosition,
-    OrganizerSetting)
+    Order, OrderPosition, CartPosition)
 from pretix.base.types import VariationDict
 from pretix.base import settings
 
diff --git a/src/pretix/presale/tests/test_cart.py b/src/pretix/presale/tests/test_cart.py
index 3feb23423..761570e35 100644
--- a/src/pretix/presale/tests/test_cart.py
+++ b/src/pretix/presale/tests/test_cart.py
@@ -368,7 +368,7 @@ class CartTest(CartTestMixin, TestCase):
         )
         response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), {
             'item_' + self.ticket.identity: '1',
-            }, follow=True)
+        }, follow=True)
         doc = BeautifulSoup(response.rendered_content)
         self.assertIn('updated', doc.select('.alert-success')[0].text)
         self.assertEqual(CartPosition.objects.current.filter(user=self.user, event=self.event).count(), 1)
@@ -384,7 +384,7 @@ class CartTest(CartTestMixin, TestCase):
         )
         response = self.client.post('/%s/%s/cart/remove' % (self.orga.slug, self.event.slug), {
             'item_' + self.ticket.identity: '2',
-            }, follow=True)
+        }, follow=True)
         doc = BeautifulSoup(response.rendered_content)
         self.assertIn('updated', doc.select('.alert-success')[0].text)
         self.assertFalse(CartPosition.objects.current.filter(user=self.user, event=self.event).exists())
diff --git a/src/pretix/presale/tests/test_event.py b/src/pretix/presale/tests/test_event.py
index f72040181..5f2d9a00e 100644
--- a/src/pretix/presale/tests/test_event.py
+++ b/src/pretix/presale/tests/test_event.py
@@ -1,7 +1,6 @@
 import datetime
-import time
 
-from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation, User
+from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation
 from pretix.base.tests import BrowserTest
 
 
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py
index 0982fdc8c..ca1460b8c 100644
--- a/src/pretix/presale/views/__init__.py
+++ b/src/pretix/presale/views/__init__.py
@@ -1,4 +1,3 @@
-import uuid
 from itertools import groupby
 from datetime import timedelta
 from django.contrib.auth.views import redirect_to_login
diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py
index 395cec4f2..edb1cd968 100644
--- a/src/pretix/presale/views/checkout.py
+++ b/src/pretix/presale/views/checkout.py
@@ -7,7 +7,7 @@ from django import forms
 from django.shortcuts import redirect
 from django.utils.functional import cached_property
 from django.utils.timezone import now
-from django.views.generic import View, TemplateView
+from django.views.generic import TemplateView
 from django.utils.translation import ugettext_lazy as _
 from pretix.base.models import CartPosition, Question, QuestionAnswer, Quota, Order, OrderPosition
 from pretix.base.signals import register_payment_providers
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index bdb0352f9..96d362a9d 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -19,7 +19,7 @@ class OrderDetailMixin:
                 user=self.request.user,
                 event=self.request.event,
                 code=self.kwargs['order'],
-                )
+            )
         except Order.DoesNotExist:
             return None
 
diff --git a/src/setup.cfg b/src/setup.cfg
index 44ecb03c6..1c6cf473b 100644
--- a/src/setup.cfg
+++ b/src/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-ignore = E128,N802,W503
+ignore = N802,W503
 max-line-length = 160
 exclude = migrations,.ropeproject,static
 max-complexity = 16