diff --git a/src/pystencils/backend/transformations/canonicalize_symbols.py b/src/pystencils/backend/transformations/canonicalize_symbols.py
index fdbba3dd30de6e8a1dad46510699f7b6c8db5a63..6fe922f28cfbfd0a42c77dbd3d1606c910abf298 100644
--- a/src/pystencils/backend/transformations/canonicalize_symbols.py
+++ b/src/pystencils/backend/transformations/canonicalize_symbols.py
@@ -29,7 +29,6 @@ class CanonContext:
             self.live_symbols_map[symb] = symb
             return symb
         else:
-            self.encountered_symbols.add(symb)
             for i in count():
                 replacement_name = f"{symb.name}__{i}"
                 if self._ctx.find_symbol(replacement_name) is None:
diff --git a/src/pystencils/backend/transformations/hoist_loop_invariant_decls.py b/src/pystencils/backend/transformations/hoist_loop_invariant_decls.py
index 723e4472ac4a0d7fd79cb4ec27e195ecf19c5a51..5920038150ee6c5295c3f46f4530639ed02fca25 100644
--- a/src/pystencils/backend/transformations/hoist_loop_invariant_decls.py
+++ b/src/pystencils/backend/transformations/hoist_loop_invariant_decls.py
@@ -73,8 +73,6 @@ class HoistLoopInvariantDeclarations:
     but makes no such assumption about instances of `CFunction`.
     """
 
-    #   TODO: Write unit tests
-
     def __init__(self, ctx: KernelCreationContext):
         self._ctx = ctx