diff --git a/freezer_api/freezer_api/storage/driver.py b/freezer_api/freezer_api/storage/driver.py
index 0870916c..bea86f85 100644
--- a/freezer_api/freezer_api/storage/driver.py
+++ b/freezer_api/freezer_api/storage/driver.py
@@ -22,7 +22,7 @@ Hudson (tjh@cryptsoft.com).
 from oslo.config import cfg
 import logging
 
-from freezer_api.storage import simpledict, elastic
+from freezer_api.storage import elastic
 
 
 opt_group = cfg.OptGroup(name='storage',
diff --git a/freezer_api/tests/test_driver.py b/freezer_api/tests/test_driver.py
index a6031da8..b904c70c 100644
--- a/freezer_api/tests/test_driver.py
+++ b/freezer_api/tests/test_driver.py
@@ -24,14 +24,10 @@ Hudson (tjh@cryptsoft.com).
 import unittest
 from mock import patch
 
-#import pytest
-#import falcon
-#from common import *
-
 from oslo.config import cfg
 
 from freezer_api.common.exceptions import *
-from freezer_api.storage import driver, elastic, simpledict
+from freezer_api.storage import driver, elastic
 
 
 class TestStorageDriver(unittest.TestCase):