diff --git a/dace/codegen/targets/cpu.py b/dace/codegen/targets/cpu.py
index c2b79fb8e6..6c658092b8 100644
--- a/dace/codegen/targets/cpu.py
+++ b/dace/codegen/targets/cpu.py
@@ -310,7 +310,7 @@ def allocate_array(self, sdfg, dfg, state_id, node, nodedesc, function_stream, d
         tokens = node.data.split('.')
         top_desc = sdfg.arrays[tokens[0]]
         # NOTE: Assuming here that all Structure members share transient/storage/lifetime properties.
-        # TODO: Study what is needed in the DaCe stuck to ensure this assumption is correct.
+        # TODO: Study what is needed in the DaCe stack to ensure this assumption is correct.
         top_transient = top_desc.transient
         top_storage = top_desc.storage
         top_lifetime = top_desc.lifetime
diff --git a/dace/codegen/targets/framecode.py b/dace/codegen/targets/framecode.py
index eb6bbd5750..269964eb56 100644
--- a/dace/codegen/targets/framecode.py
+++ b/dace/codegen/targets/framecode.py
@@ -566,7 +566,7 @@ def determine_allocation_lifetime(self, top_sdfg: SDFG):
 
         for sdfg, name, desc in top_sdfg.arrays_recursive(include_nested_data=True):
             # NOTE: Assuming here that all Structure members share transient/storage/lifetime properties.
-            # TODO: Study what is needed in the DaCe stuck to ensure this assumption is correct.
+            # TODO: Study what is needed in the DaCe stack to ensure this assumption is correct.
             top_desc = sdfg.arrays[name.split('.')[0]]
             top_transient = top_desc.transient
             top_storage = top_desc.storage
diff --git a/dace/sdfg/sdfg.py b/dace/sdfg/sdfg.py
index 8af5f2bcb0..9874ecbe9d 100644
--- a/dace/sdfg/sdfg.py
+++ b/dace/sdfg/sdfg.py
@@ -1224,8 +1224,8 @@ def remove_node(self, node: SDFGState):
         return super().remove_node(node)
 
     def states(self):
-        """ Alias that returns the nodes (states) in this SDFG. """
-        return self.nodes()
+        """ Returns the states in this SDFG, recursing into state scope blocks. """
+        return list(self.all_states())
 
     def all_nodes_recursive(self) -> Iterator[Tuple[nd.Node, Union['SDFG', 'SDFGState']]]:
         """ Iterate over all nodes in this SDFG, including states, nodes in
diff --git a/dace/transformation/interstate/sdfg_nesting.py b/dace/transformation/interstate/sdfg_nesting.py
index 1c30a2f111..8f5bd8f55f 100644
--- a/dace/transformation/interstate/sdfg_nesting.py
+++ b/dace/transformation/interstate/sdfg_nesting.py
@@ -13,11 +13,10 @@
 import operator
 import copy
 
-from dace import memlet, registry, sdfg as sd, Memlet, symbolic, dtypes, subsets
+from dace import memlet, Memlet, symbolic, dtypes, subsets
 from dace.frontend.python import astutils
 from dace.sdfg import nodes, propagation, utils
 from dace.sdfg.graph import MultiConnectorEdge, SubgraphView
-from dace.sdfg.replace import replace_properties_dict
 from dace.sdfg import SDFG, SDFGState
 from dace.sdfg import utils as sdutil, infer_types, propagation
 from dace.transformation import transformation, helpers