diff --git a/sw/utility/simulation.py b/sw/utility/simulation.py
index 84cf7fb..a403daf 100644
--- a/sw/utility/simulation.py
+++ b/sw/utility/simulation.py
@@ -210,7 +210,6 @@ class Simulator:
         """
         return self._sim_done
 
-    # TODO: Make sure the length of each BER_array is the same as the number of SNRs
     @property
     def SNRs_and_BERs(self) -> typing.Tuple[np.array, np.array]:
         """Get the current results.
@@ -237,7 +236,6 @@ class Simulator:
         return SNRs, BERs
 
 
-# TODO: Remove save data after successful execution
 # TODO: Write currently calculated BERs to file when simulation is stopped
 class SimulationManager:
     """This class only contains functions relating to stopping and restarting of simulations
@@ -290,7 +288,6 @@ class SimulationManager:
 
         os.remove(self._sim_state_filepath)
 
-    # TODO: Make sure old state is overwritten
     def _save_state(self) -> None:
         """Write the state of the currently configured simulation to a savefile."""
         if self._simulator is not None: