diff --git a/pkgs/clan-cli/clan_cli/vars/_types.py b/pkgs/clan-cli/clan_cli/vars/_types.py
index ed7ef6009..e1095b93a 100644
--- a/pkgs/clan-cli/clan_cli/vars/_types.py
+++ b/pkgs/clan-cli/clan_cli/vars/_types.py
@@ -107,18 +107,6 @@ class StoreBase(ABC):
                 )
         return new_file
 
-    def get_all(self) -> list["Var"]:
-        all_vars = []
-        for generator in self.machine.vars_generators:
-            for var in generator.files:
-                # only handle vars compatible to this store
-                if self.is_secret_store != var.secret:
-                    continue
-                var.store(self)
-                var.generator(generator)
-                all_vars.append(var)
-        return all_vars
-
     def get_validation(self, generator: "Generator") -> str | None:
         """
         Return the invalidation hash that indicates if a generator needs to be re-run
diff --git a/pkgs/clan-cli/clan_cli/vars/list.py b/pkgs/clan-cli/clan_cli/vars/list.py
index f89e229f5..b6c6d06e8 100644
--- a/pkgs/clan-cli/clan_cli/vars/list.py
+++ b/pkgs/clan-cli/clan_cli/vars/list.py
@@ -28,7 +28,16 @@ def secret_store(machine: Machine) -> SecretStoreBase:
 def get_vars(machine: Machine) -> list[Var]:
     pub_store = public_store(machine)
     sec_store = secret_store(machine)
-    return pub_store.get_all() + sec_store.get_all()
+    all_vars = []
+    for generator in machine.vars_generators:
+        for var in generator.files:
+            if var.secret:
+                var.store(sec_store)
+            else:
+                var.store(pub_store)
+            var.generator(generator)
+            all_vars.append(var)
+    return all_vars
 
 
 def _get_previous_value(