5 files changed, 2 insertions, 13 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index b04fbb4177..73dc844d59 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -21,8 +21,6 @@ These actions are mostly only used by the :py:mod:`.replication` module.
 
 from twisted.internet import defer
 
-from .units import Pdu
-
 from synapse.util.logutils import log_function
 
 import json
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index c2d8dca8f3..9b25556707 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -18,11 +18,8 @@ server protocol.
 """
 
 from synapse.util.jsonobject import JsonEncodedObject
-from syutil.base64util import encode_base64
 
 import logging
-import json
-import copy
 
 
 logger = logging.getLogger(__name__)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index bdd28f04bb..49bfff88a4 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -17,15 +17,13 @@
 
 from ._base import BaseHandler
 
-from synapse.api.events.room import InviteJoinEvent, RoomMemberEvent
+from synapse.api.events.room import RoomMemberEvent
 from synapse.api.constants import Membership
 from synapse.util.logutils import log_function
 from synapse.federation.pdu_codec import PduCodec
-from synapse.api.errors import SynapseError
 from synapse.util.async import run_on_reactor
-from synapse.types import EventID
 
-from twisted.internet import defer, reactor
+from twisted.internet import defer
 
 import logging
 
diff --git a/synapse/state.py b/synapse/state.py
index f4efc287c9..9771883bc3 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -19,8 +19,6 @@ from twisted.internet import defer
 from synapse.util.logutils import log_function
 from synapse.util.async import run_on_reactor
 
-from synapse.types import EventID
-
 from collections import namedtuple
 
 import copy
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 464b12f032..5e00c23fd1 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -14,8 +14,6 @@
 # limitations under the License.
 import logging
 
-from twisted.internet import defer
-
 from synapse.api.errors import StoreError
 from synapse.api.events.utils import prune_event
 from synapse.util.logutils import log_function