diff --git a/python/composio/tools/local/codeanalysis/actions/create_codemap.py b/python/composio/tools/local/codeanalysis/actions/create_codemap.py
index d6954d45c34..96e31e5dd6a 100644
--- a/python/composio/tools/local/codeanalysis/actions/create_codemap.py
+++ b/python/composio/tools/local/codeanalysis/actions/create_codemap.py
@@ -71,6 +71,8 @@ def execute(
     ) -> CreateCodeMapResponse:
         if "create_fqdn" not in metadata:
             metadata["create_fqdn"] = True
+        if "create_index" not in metadata:
+            metadata["create_index"] = True
         if "is_python" not in metadata:
             metadata["is_python"] = True
 
@@ -123,7 +125,8 @@ def _process(self, status: Dict[str, Any], metadata: Dict[str, Any]) -> None:
                     self.load_all_fqdns()
                 status = self._update_status(self.REPO_DIR, Status.LOADING_INDEX)
             if status["status"] == Status.LOADING_INDEX:
-                self.create_index(metadata["is_python"])
+                if metadata["create_index"]:
+                    self.create_index(metadata["is_python"])
                 status = self._update_status(self.REPO_DIR, Status.COMPLETED)
         except Exception as e:
             self._update_status(self.REPO_DIR, Status.FAILED)
diff --git a/python/composio/tools/local/codeanalysis/tool.py b/python/composio/tools/local/codeanalysis/tool.py
index 5d3c4dc7e78..0c3defaf328 100644
--- a/python/composio/tools/local/codeanalysis/tool.py
+++ b/python/composio/tools/local/codeanalysis/tool.py
@@ -18,7 +18,6 @@ class CodeAnalysisTool(LocalTool, autoload=True):
         "tree_sitter==0.21.3",
         "deeplake>3.9,<4",
         "sentence-transformers",
-        "tokenizers>=0.20,<0.21",
         "tree_sitter_languages",
         "git+https://github.com/DataDog/jedi.git@92d0c807b0dcd115b1ffd0a4ed21e44db127c2fb#egg=jedi",
         "PyJWT",  # deeplake/client/client.py:41
diff --git a/python/composio/tools/local/filetool/actions/git_clone.py b/python/composio/tools/local/filetool/actions/git_clone.py
index 77cfbe2ebd4..2a7fcb08fc4 100644
--- a/python/composio/tools/local/filetool/actions/git_clone.py
+++ b/python/composio/tools/local/filetool/actions/git_clone.py
@@ -18,7 +18,6 @@ def git_reset_cmd(commit_id: str) -> str:
         "git remote get-url origin",
         f"git fetch --depth 1 origin {commit_id}",
         f"git reset --hard {commit_id}",
-        "git clean -fdx",
         "git status",
     ]
     return " && ".join(reset_commands)