diff --git a/synapse/config/repository.py b/synapse/config/repository.py
index 407c8d6c24df521bb5c093378b5ac09cb4f7bb45..b71d30227cb9dc47a4613073f2d0c5e91830394a 100644
--- a/synapse/config/repository.py
+++ b/synapse/config/repository.py
@@ -14,7 +14,6 @@
 # limitations under the License.
 
 from ._base import Config
-import os
 
 class ContentRepositoryConfig(Config):
     def __init__(self, args):
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 1ebbeab2e74ef64f5e493a15dae81ae4af75bf63..32d9c1392b92cc3120a2f66deff63a20ee03cb80 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -105,7 +105,7 @@ class DataStore(RoomMemberStore, RoomStore,
                 stream_ordering=stream_ordering,
                 is_new_state=is_new_state,
             )
-        except _RollbackButIsFineException as e:
+        except _RollbackButIsFineException:
             pass
 
     @defer.inlineCallbacks
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 958e730591a5630d4f532769f97ff7bbba2751f5..ceeef5880ed45d9682a63403fb3cca2b294f05a5 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -18,7 +18,6 @@ from twisted.internet import defer
 from ._base import SQLBaseStore
 
 from synapse.api.constants import Membership
-from synapse.util.logutils import log_function
 
 import logging