diff --git a/pokedex/db/load.py b/pokedex/db/load.py
index c77064f..e9d3fd1 100644
--- a/pokedex/db/load.py
+++ b/pokedex/db/load.py
@@ -4,7 +4,6 @@ import fnmatch
 import os.path
 import sys
 
-from sqlalchemy.orm.attributes import instrumentation_registry
 import sqlalchemy.sql.util
 import sqlalchemy.types
 
diff --git a/pokedex/db/markdown.py b/pokedex/db/markdown.py
index 328b131..725f931 100644
--- a/pokedex/db/markdown.py
+++ b/pokedex/db/markdown.py
@@ -14,7 +14,6 @@ from __future__ import absolute_import
 import re
 
 import markdown
-import sqlalchemy.types
 from sqlalchemy.orm.session import object_session
 
 class MarkdownString(object):
diff --git a/pokedex/tests/test_strings.py b/pokedex/tests/test_strings.py
index 09fe6f9..03ca60d 100644
--- a/pokedex/tests/test_strings.py
+++ b/pokedex/tests/test_strings.py
@@ -1,6 +1,7 @@
 # Encoding: UTF-8
 
 import pytest
+from sqlalchemy.orm.exc import NoResultFound
 
 from pokedex.tests import positional_params