diff --git a/zerver/tests/test_tornado.py b/zerver/tests/test_tornado.py
index abc70a6da1..322a6e4e73 100644
--- a/zerver/tests/test_tornado.py
+++ b/zerver/tests/test_tornado.py
@@ -15,14 +15,13 @@ from django.http import HttpRequest, HttpResponse
 from django.db import close_old_connections
 from django.core import signals
 from django.test import override_settings
-from tornado.gen import Return
 from tornado.httpclient import HTTPRequest, HTTPResponse
 
 from zerver.lib.test_helpers import POSTRequestMock
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.topic import TOPIC_NAME
 
-from zerver.models import UserProfile, get_client
+from zerver.models import UserProfile
 
 from tornado import gen
 from tornado.testing import AsyncHTTPTestCase, gen_test
@@ -32,7 +31,7 @@ from tornado.websocket import websocket_connect
 from zerver.tornado.application import create_tornado_application
 from zerver.tornado import event_queue
 from zerver.tornado.event_queue import fetch_events, \
-    allocate_client_descriptor, process_event
+    process_event
 from zerver.tornado.views import get_events
 
 from http.cookies import SimpleCookie
diff --git a/zerver/tornado/application.py b/zerver/tornado/application.py
index 504d44cdf6..ec8fd3f5ff 100644
--- a/zerver/tornado/application.py
+++ b/zerver/tornado/application.py
@@ -3,7 +3,6 @@ import atexit
 
 import tornado.web
 from django.conf import settings
-from tornado import ioloop
 from zerver.tornado import autoreload
 
 from zerver.lib.queue import get_queue_client
diff --git a/zerver/tornado/autoreload.py b/zerver/tornado/autoreload.py
index b43504ebd4..92e1002864 100644
--- a/zerver/tornado/autoreload.py
+++ b/zerver/tornado/autoreload.py
@@ -55,10 +55,6 @@ import os
 import sys
 import functools
 import importlib
-import logging
-import os
-import pkgutil  # type: ignore # upstream
-import sys
 import traceback
 import types
 import subprocess
@@ -67,7 +63,6 @@ import weakref
 from tornado import ioloop
 from tornado.log import gen_log
 from tornado import process
-from tornado.util import exec_in
 
 try:
     import signal
diff --git a/zerver/tornado/descriptors.py b/zerver/tornado/descriptors.py
index 58a2a7e8b3..a911b92a9d 100644
--- a/zerver/tornado/descriptors.py
+++ b/zerver/tornado/descriptors.py
@@ -1,5 +1,4 @@
-
-from typing import Any, Dict, Optional
+from typing import Dict, Optional
 
 if False:
     from zerver.tornado.event_queue import ClientDescriptor
diff --git a/zerver/tornado/event_queue.py b/zerver/tornado/event_queue.py
index 09d86acf9f..b7421a0148 100644
--- a/zerver/tornado/event_queue.py
+++ b/zerver/tornado/event_queue.py
@@ -31,7 +31,7 @@ from zerver.lib.request import JsonableError
 from zerver.tornado.descriptors import clear_descriptor_by_handler_id, set_descriptor_by_handler_id
 from zerver.tornado.exceptions import BadEventQueueIdError
 from zerver.tornado.sharding import get_tornado_uri, get_tornado_port, \
-    notify_tornado_queue_name, tornado_return_queue_name
+    notify_tornado_queue_name
 import copy
 
 requests_client = requests.Session()
diff --git a/zerver/tornado/socket.py b/zerver/tornado/socket.py
index 67774b094b..f041e8da1a 100644
--- a/zerver/tornado/socket.py
+++ b/zerver/tornado/socket.py
@@ -19,11 +19,9 @@ from sockjs.tornado.session import ConnectionInfo
 import tornado.ioloop
 import ujson
 import logging
-import time
 
-from zerver.models import UserProfile, get_user_profile_by_id, get_client
+from zerver.models import UserProfile, get_user_profile_by_id
 from zerver.lib.queue import queue_json_publish
-from zerver.lib.actions import check_send_message, extract_recipients
 from zerver.decorator import JsonableError
 from zerver.middleware import record_request_start_data, record_request_stop_data, \
     record_request_restart_data, write_log_line, format_timedelta
diff --git a/zerver/tornado/websocket_client.py b/zerver/tornado/websocket_client.py
index 33cebb1987..dcb081f7fa 100644
--- a/zerver/tornado/websocket_client.py
+++ b/zerver/tornado/websocket_client.py
@@ -10,7 +10,7 @@ from tornado.ioloop import IOLoop
 from tornado import gen
 from tornado.httpclient import HTTPRequest
 from tornado.websocket import websocket_connect, WebSocketClientConnection
-from urllib.parse import urlparse, urlunparse, urljoin
+from urllib.parse import urlparse, urljoin
 from http.cookies import SimpleCookie
 
 from zerver.models import get_system_bot