diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py
index 19b560d91..7aff2e69e 100644
--- a/synapse/handlers/login.py
+++ b/synapse/handlers/login.py
@@ -16,13 +16,9 @@
 from twisted.internet import defer
 
 from ._base import BaseHandler
-from synapse.api.errors import LoginError, Codes, CodeMessageException
-from synapse.http.client import SimpleHttpClient
-from synapse.util.emailutils import EmailException
-import synapse.util.emailutils as emailutils
+from synapse.api.errors import LoginError, Codes
 
 import bcrypt
-import json
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/synapse/rest/client/v2_alpha/password.py b/synapse/rest/client/v2_alpha/password.py
index 3663781c9..127753211 100644
--- a/synapse/rest/client/v2_alpha/password.py
+++ b/synapse/rest/client/v2_alpha/password.py
@@ -21,7 +21,6 @@ from synapse.http.servlet import RestServlet
 
 from ._base import client_v2_pattern, parse_json_dict_from_request
 
-import simplejson as json
 import logging
 
 
@@ -72,5 +71,6 @@ class PasswordRestServlet(RestServlet):
 
         defer.returnValue((200, {}))
 
+
 def register_servlets(hs, http_server):
-    PasswordRestServlet(hs).register(http_server)
\ No newline at end of file
+    PasswordRestServlet(hs).register(http_server)