diff --git a/aider/repo.py b/aider/repo.py
index 08e1b85ee..a3e8d542e 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -36,6 +36,9 @@ class GitRepo:
         self.io = io
         self.models = models
 
+        self.normalized_path = {}
+        self.tree_files = {}
+
         self.attribute_author = attribute_author
         self.attribute_committer = attribute_committer
         self.attribute_commit_message = attribute_commit_message
@@ -229,8 +232,6 @@ class GitRepo:
 
         return diffs
 
-    tree_files = {}
-
     def get_tracked_files(self):
         if not self.repo:
             return []
@@ -260,8 +261,6 @@ class GitRepo:
 
         return res
 
-    normalized_path = {}
-
     def normalize_path(self, path):
         orig_path = path
         res = self.normalized_path.get(orig_path)
diff --git a/aider/repomap.py b/aider/repomap.py
index 0edce8233..f35614dba 100644
--- a/aider/repomap.py
+++ b/aider/repomap.py
@@ -33,8 +33,6 @@ class RepoMap:
 
     warned_files = set()
 
-    tokens_per_char = None
-
     def __init__(
         self,
         map_tokens=1024,
@@ -87,9 +85,6 @@ class RepoMap:
         if not mentioned_idents:
             mentioned_idents = set()
 
-        # reset the estimate
-        self.tokens_per_char = None
-
         max_map_tokens = self.max_map_tokens
 
         # With no files in the chat, give a bigger view of the entire repo