diff --git a/api/chalicelib/core/autocomplete/__init__.py b/api/chalicelib/core/autocomplete/__init__.py
index 0186c2f29..e69de29bb 100644
--- a/api/chalicelib/core/autocomplete/__init__.py
+++ b/api/chalicelib/core/autocomplete/__init__.py
@@ -1,11 +0,0 @@
-import logging
-
-from decouple import config
-
-logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
-
-if config("EXP_AUTOCOMPLETE", cast=bool, default=False):
-    logging.info(">>> Using experimental autocomplete")
-    from . import autocomplete_ch as autocomplete
-else:
-    from . import autocomplete
diff --git a/api/chalicelib/core/events.py b/api/chalicelib/core/events.py
index afb955355..dd6ca960a 100644
--- a/api/chalicelib/core/events.py
+++ b/api/chalicelib/core/events.py
@@ -204,9 +204,6 @@ def search(text, event_type, project_id, source, key):
 
     if event_type in SUPPORTED_TYPES.keys():
         rows = SUPPORTED_TYPES[event_type].get(project_id=project_id, value=text, key=key, source=source)
-        # for IOS events autocomplete
-        # if event_type + "_IOS" in SUPPORTED_TYPES.keys():
-        #     rows += SUPPORTED_TYPES[event_type + "_IOS"].get(project_id=project_id, value=text, key=key,source=source)
     elif event_type + "_MOBILE" in SUPPORTED_TYPES.keys():
         rows = SUPPORTED_TYPES[event_type + "_MOBILE"].get(project_id=project_id, value=text, key=key, source=source)
     elif event_type in sessions_metas.SUPPORTED_TYPES.keys():
diff --git a/api/chalicelib/core/metrics/metrics_ch.py b/api/chalicelib/core/metrics/metrics_ch.py
index 86bcb2f29..55830833b 100644
--- a/api/chalicelib/core/metrics/metrics_ch.py
+++ b/api/chalicelib/core/metrics/metrics_ch.py
@@ -90,14 +90,6 @@ def __complete_missing_steps(start_time, end_time, density, neutral, rows, time_
             neutral_clone[time_key] = optimal[o][0]
             result.append(neutral_clone)
             o += 1
-        # elif r < len(rows) and rows[r][time_key] >= optimal[o][1]:
-        #     neutral_clone[time_key] = optimal[o][0]
-        #     result.append(neutral_clone)
-        #     o += 1
-        # else:
-        #     neutral_clone[time_key] = optimal[o][0]
-        #     result.append(neutral_clone)
-        #     o += 1
     return result
 
 
diff --git a/api/routers/core.py b/api/routers/core.py
index 9bfddef5d..7565f8454 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -32,8 +32,7 @@ def events_search(projectId: int, q: Optional[str] = None,
                   context: schemas.CurrentContext = Depends(OR_context)):
     if type and (not q or len(q) == 0) \
             and (autocomplete.is_top_supported(type)):
-        # return autocomplete.get_top_values(project_id=projectId, event_type=type, event_key=key)
-        return autocomplete.get_top_values(projectId, type, event_key=key)
+        return autocomplete.get_top_values(project_id=projectId, event_type=type, event_key=key)
     elif not q or len(q) == 0:
         return {"data": []}
 
diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 95be04062..6c57c2afb 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -187,7 +187,7 @@ Pipfile.lock
 /chalicelib/core/announcements.py
 /chalicelib/core/assist.py
 /chalicelib/core/authorizers.py
-/chalicelib/core/autocomplete/*
+/chalicelib/core/autocomplete/autocomplete.py
 /chalicelib/core/boarding.py
 /chalicelib/core/canvas.py
 /chalicelib/core/collaborations/*
diff --git a/ee/api/chalicelib/core/autocomplete/__init__.py b/ee/api/chalicelib/core/autocomplete/__init__.py
new file mode 100644
index 000000000..0186c2f29
--- /dev/null
+++ b/ee/api/chalicelib/core/autocomplete/__init__.py
@@ -0,0 +1,11 @@
+import logging
+
+from decouple import config
+
+logging.basicConfig(level=config("LOGLEVEL", default=logging.INFO))
+
+if config("EXP_AUTOCOMPLETE", cast=bool, default=False):
+    logging.info(">>> Using experimental autocomplete")
+    from . import autocomplete_ch as autocomplete
+else:
+    from . import autocomplete
diff --git a/api/chalicelib/core/autocomplete/autocomplete_ch.py b/ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
similarity index 100%
rename from api/chalicelib/core/autocomplete/autocomplete_ch.py
rename to ee/api/chalicelib/core/autocomplete/autocomplete_ch.py
diff --git a/ee/api/clean-dev.sh b/ee/api/clean-dev.sh
index 464617d54..e850056fd 100755
--- a/ee/api/clean-dev.sh
+++ b/ee/api/clean-dev.sh
@@ -9,7 +9,7 @@ rm -rf ./build_crons.sh
 rm -rf ./chalicelib/core/announcements.py
 rm -rf ./chalicelib/core/assist.py
 rm -rf ./chalicelib/core/authorizers.py
-rm -rf ./chalicelib/core/autocomplete
+rm -rf ./chalicelib/core/autocomplete/autocomplete.py
 rm -rf ./chalicelib/core/collaborations
 rm -rf ./chalicelib/core/countries.py
 rm -rf ./chalicelib/core/metrics/metrics.py