diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index d06033b980..a97a42e1e3 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -16,8 +16,9 @@
from twisted.internet import defer
from synapse.api.events.room import (
- RoomMemberEvent, MessageEvent, RoomTopicEvent, FeedbackEvent,
- RoomConfigEvent, RoomNameEvent,
+ RoomMemberEvent, RoomTopicEvent, FeedbackEvent,
+# RoomConfigEvent,
+ RoomNameEvent,
)
from synapse.util.logutils import log_function
diff --git a/synapse/storage/feedback.py b/synapse/storage/feedback.py
index e60f98d1e1..cdc6670116 100644
--- a/synapse/storage/feedback.py
+++ b/synapse/storage/feedback.py
@@ -15,11 +15,7 @@
from twisted.internet import defer
-from ._base import SQLBaseStore, Table
-from synapse.api.events.room import FeedbackEvent
-
-import collections
-import json
+from ._base import SQLBaseStore
class FeedbackStore(SQLBaseStore):
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 22f2dcca45..a5751005ef 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -18,12 +18,10 @@ from twisted.internet import defer
from sqlite3 import IntegrityError
from synapse.api.errors import StoreError
-from synapse.api.events.room import RoomTopicEvent
from ._base import SQLBaseStore, Table
import collections
-import json
import logging
logger = logging.getLogger(__name__)
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 86519b60c6..4ad37af0f3 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -15,15 +15,10 @@
from twisted.internet import defer
-from synapse.types import UserID
-from synapse.api.constants import Membership
-from synapse.api.events.room import RoomMemberEvent
-
-from ._base import SQLBaseStore, Table
+from ._base import SQLBaseStore
+from synapse.api.constants import Membership
-import collections
-import json
import logging
logger = logging.getLogger(__name__)
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index 3a17a723fe..cae80563b4 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -37,10 +37,8 @@ from twisted.internet import defer
from ._base import SQLBaseStore
from synapse.api.errors import SynapseError
-from synapse.api.constants import Membership
from synapse.util.logutils import log_function
-import json
import logging
|