diff --git a/sahara/cli/sahara_api.py b/sahara/cli/sahara_api.py
index 2519490144..17f2d3dac0 100644
--- a/sahara/cli/sahara_api.py
+++ b/sahara/cli/sahara_api.py
@@ -38,7 +38,6 @@ gettext.install('sahara', unicode=1)
 
 
 from sahara import config
-from sahara.db import api as db_api
 import sahara.main as server
 from sahara.openstack.common import log as logging
 
@@ -58,9 +57,6 @@ def main():
     config.parse_configs(sys.argv[1:], config_files)
     logging.setup("sahara")
 
-    if not db_api.setup_db():
-        raise RuntimeError('Failed to create database!')
-
     app = server.make_app()
 
     wsgi.server(eventlet.listen((cfg.CONF.host, cfg.CONF.port), backlog=500),
diff --git a/sahara/utils/hacking/checks.py b/sahara/utils/hacking/checks.py
index 890f7a12be..21c033e758 100644
--- a/sahara/utils/hacking/checks.py
+++ b/sahara/utils/hacking/checks.py
@@ -39,9 +39,7 @@ def import_db_only_in_conductor(logical_line, filename):
     if _any_in(filename,
                "sahara/conductor",
                "sahara/tests",
-               "sahara/db",
-               "sahara/main.py",
-               "sahara/cli"):
+               "sahara/db"):
         return
 
     if _starts_with_any(logical_line,