diff --git a/pantalaimon/client.py b/pantalaimon/client.py
index 882f6be..f2f6895 100644
--- a/pantalaimon/client.py
+++ b/pantalaimon/client.py
@@ -16,7 +16,6 @@ import asyncio
 import os
 from collections import defaultdict
 from pprint import pformat
-from typing import Any, Dict, Optional
 from urllib.parse import urlparse
 
 from aiohttp.client_exceptions import ClientConnectionError
diff --git a/pantalaimon/index.py b/pantalaimon/index.py
index e4f4aa0..3d49614 100644
--- a/pantalaimon/index.py
+++ b/pantalaimon/index.py
@@ -23,7 +23,6 @@ if False:
     import json
     import os
     from functools import partial
-    from typing import Any, Dict, List, Optional, Tuple
 
     import attr
     import tantivy
diff --git a/pantalaimon/main.py b/pantalaimon/main.py
index 0ab42d6..abc411c 100644
--- a/pantalaimon/main.py
+++ b/pantalaimon/main.py
@@ -15,7 +15,6 @@
 import asyncio
 import os
 import signal
-from typing import Optional
 
 import click
 import janus
diff --git a/pantalaimon/store.py b/pantalaimon/store.py
index ee6f377..0dfe045 100644
--- a/pantalaimon/store.py
+++ b/pantalaimon/store.py
@@ -15,7 +15,7 @@
 import json
 import os
 from collections import defaultdict
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict
 
 import attr
 from nio.crypto import TrustState, GroupSessionStore
diff --git a/tests/proxy_test.py b/tests/proxy_test.py
index f0856d8..ecf515e 100644
--- a/tests/proxy_test.py
+++ b/tests/proxy_test.py
@@ -1,9 +1,7 @@
-import asyncio
 import json
 import re
 from collections import defaultdict
 
-from aiohttp import web
 from nio.crypto import OlmDevice
 
 from conftest import faker
diff --git a/tests/store_test.py b/tests/store_test.py
index 13acfb0..2ecef85 100644
--- a/tests/store_test.py
+++ b/tests/store_test.py
@@ -1,12 +1,10 @@
 import asyncio
-import pdb
 import pprint
 import pytest
 
 from nio import RoomMessage, RoomEncryptedMedia
 
 from urllib.parse import urlparse
-from conftest import faker
 from pantalaimon.index import INDEXING_ENABLED
 from pantalaimon.store import FetchTask, MediaInfo, UploadInfo
 
@@ -81,7 +79,6 @@ class TestClass(object):
 
     def test_account_loading(self, panstore):
         accounts = panstore.load_all_users()
-        # pdb.set_trace()
         assert len(accounts) == 10
 
     def test_token_saving(self, panstore, access_token):
@@ -132,7 +129,7 @@ class TestClass(object):
         if not INDEXING_ENABLED:
             pytest.skip("Indexing needs to be enabled to test this")
 
-        from pantalaimon.index import Index, IndexStore
+        from pantalaimon.index import IndexStore
 
         loop = asyncio.get_event_loop()