diff --git a/src/codegen/git/models/codemod_context.py b/src/codegen/git/models/codemod_context.py
index 50d34478e..36204b8d4 100644
--- a/src/codegen/git/models/codemod_context.py
+++ b/src/codegen/git/models/codemod_context.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 from typing import Any
 
diff --git a/src/codegen/git/schemas/repo_config.py b/src/codegen/git/schemas/repo_config.py
index b9ea08f26..b43de3954 100644
--- a/src/codegen/git/schemas/repo_config.py
+++ b/src/codegen/git/schemas/repo_config.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import base64
 import logging
 
@@ -37,6 +35,6 @@ def encoded_json(self):
         return base64.b64encode(self.model_dump_json().encode("utf-8")).decode("utf-8")
 
     @staticmethod
-    def from_encoded_json(encoded_json: str) -> RepoConfig:
+    def from_encoded_json(encoded_json: str) -> "RepoConfig":
         decoded = base64.b64decode(encoded_json).decode("utf-8")
         return RepoConfig.model_validate_json(decoded)
diff --git a/src/codegen/sdk/enums.py b/src/codegen/sdk/enums.py
index c98391b72..09d07344a 100644
--- a/src/codegen/sdk/enums.py
+++ b/src/codegen/sdk/enums.py
@@ -1,13 +1,8 @@
-from __future__ import annotations
-
 from enum import IntEnum, StrEnum, auto
-from typing import TYPE_CHECKING, NamedTuple
+from typing import NamedTuple
 
 from codegen.sdk.core.dataclasses.usage import Usage
 
-if TYPE_CHECKING:
-    pass
-
 
 class NodeType(IntEnum):
     """NodeType is an enumeration class that defines different types of nodes within the graph."""
diff --git a/src/codegen/sdk/utils.py b/src/codegen/sdk/utils.py
index 421246de9..32d7538df 100644
--- a/src/codegen/sdk/utils.py
+++ b/src/codegen/sdk/utils.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 import re
 import shutil
@@ -7,7 +5,6 @@
 from collections.abc import Iterable
 from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, TypeVar
 from xml.dom.minidom import parseString
 
 import dicttoxml
@@ -18,8 +15,6 @@
 from codegen.sdk.extensions.utils import find_all_descendants, find_first_descendant, get_all_identifiers
 from codegen.sdk.typescript.enums import TSFunctionTypeNames
 
-if TYPE_CHECKING:
-    from codegen.sdk.core.interfaces.editable import Editable
 """
 Utility functions for traversing the tree sitter structure.
 Do not include language specific traversals, or string manipulations here.
@@ -197,9 +192,6 @@ def shadow_files(files: str | list[str]):
                 os.remove(shadow_file_name)
 
 
-E = TypeVar("E", bound="Editable")
-
-
 def calculate_base_path(full_path, relative_path):
     """Calculate the base path represented by './' in a relative path.
 
diff --git a/src/codegen/utils/compilation/function_compilation.py b/src/codegen/utils/compilation/function_compilation.py
index 0e16cb19d..c348e2766 100644
--- a/src/codegen/utils/compilation/function_compilation.py
+++ b/src/codegen/utils/compilation/function_compilation.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import linecache
 import logging
 import sys
diff --git a/src/codegen/utils/compilation/function_construction.py b/src/codegen/utils/compilation/function_construction.py
index 6d199fec5..3b226a9f5 100644
--- a/src/codegen/utils/compilation/function_construction.py
+++ b/src/codegen/utils/compilation/function_construction.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import logging
 import re
 
diff --git a/src/codegen/utils/compilation/string_to_code.py b/src/codegen/utils/compilation/string_to_code.py
index 3cb585c89..68ed1b718 100644
--- a/src/codegen/utils/compilation/string_to_code.py
+++ b/src/codegen/utils/compilation/string_to_code.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import linecache
 import logging
 import sys