diff --git a/lib/auth.py b/lib/auth.py
index 5a00b83..7147e78 100644
--- a/lib/auth.py
+++ b/lib/auth.py
@@ -18,10 +18,6 @@ from models.account import UserCache
 def auth_with_key(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
-        # if isinstance(getattr(g, 'user', None), User):
-        #     identity_changed.send(current_app._get_current_object(),
-        #                           identity=Identity(g.user.uid))
-        #     return func(*args, **kwargs)
         ip = request.remote_addr
         if request.data:
             request_args = dict()
diff --git a/lib/search.py b/lib/search.py
index 72e9b21..fc9c997 100644
--- a/lib/search.py
+++ b/lib/search.py
@@ -9,7 +9,7 @@ from lib.const import TableMap
 from models.attribute import CIAttributeCache
 from models.ci_type import CITypeCache
 from extensions import db
-from models import CI
+from models.ci import CI
 from lib.ci import get_cis_by_ids
 from lib.query_sql import FACET_QUERY
 from lib.query_sql import QUERY_CI_BY_TYPE
@@ -362,4 +362,4 @@ class Search(object):
                 counter[ci_type] = 0
             counter[ci_type] += 1
         total = len(response)
-        return response, counter, total, self.page, numfound, facet
\ No newline at end of file
+        return response, counter, total, self.page, numfound, facet
diff --git a/models/__init__.py b/models/__init__.py
index b5f28a6..a28cb5d 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -10,15 +10,4 @@ def row2dict(row):
             d[c.name] = getattr(row, c.name).strftime("%Y-%m-%d %H:%M:%S")
         else:
             d[c.name] = getattr(row, c.name)
-    return d
-
-
-from account import *
-from attribute import *
-from ci import *
-from ci_relation import *
-from ci_type import *
-from ci_type_relation import *
-from ci_value import *
-from history import *
-from statis import *
+    return d
\ No newline at end of file