diff --git a/taca/analysis/analysis_element.py b/taca/analysis/analysis_element.py
index d18e71f1..10b2adf1 100755
--- a/taca/analysis/analysis_element.py
+++ b/taca/analysis/analysis_element.py
@@ -148,7 +148,7 @@ def _process(run):
     else:
         data_dirs = CONFIG.get("element_analysis").get(
             "data_dirs"
-        )  # TODO: add to config
+        )
         for data_dir in data_dirs:
             # Run folder looks like DATE_*_*, the last section is the FC side (A/B) and name
             runs = glob.glob(os.path.join(data_dir, "[1-9]*_*_*"))
diff --git a/taca/element/Element_Runs.py b/taca/element/Element_Runs.py
index c2ac77c8..9e51ae3e 100644
--- a/taca/element/Element_Runs.py
+++ b/taca/element/Element_Runs.py
@@ -130,7 +130,7 @@ def __init__(self, run_dir, configuration):
             .get("Element", {})
             .get(self.sequencer_type, {})
             .get("transfer_log")
-        )  # TODO: add to taca.yaml
+        )
         self.rsync_exit_file = os.path.join(self.run_dir, ".rsync_exit_status")
 
         # Instrument generated files
@@ -340,7 +340,7 @@ def get_lims_step_id(self) -> str | None:
         the ID of the LIMS step can be extracted from it.
         """
 
-        # TODO test me
+        # TODO: test me
 
         assert self.manifest_exists(), "Run manifest not found"
         with open(self.run_manifest_file_from_instrument) as csv_file:
@@ -357,7 +357,7 @@ def find_manifest_zip(self):
             self.CONFIG.get("element_analysis")
             .get("Element", {})
             .get(self.sequencer_type, {})
-            .get("manifest_zip_location"),  # TODO: add to taca.yaml
+            .get("manifest_zip_location"),
             str(self.year),
         )
 
@@ -575,7 +575,7 @@ def make_demux_manifests(
 
     def generate_demux_command(self, run_manifest, demux_dir):
         command = (
-            f"{self.CONFIG.get('element_analysis').get('bases2fastq')}"  # TODO: add path to bases2fastq executable to config
+            f"{self.CONFIG.get('element_analysis').get('bases2fastq')}"
             + f" {self.run_dir}"
             + f" {demux_dir}"
             + " -p 8"
@@ -583,7 +583,7 @@ def generate_demux_command(self, run_manifest, demux_dir):
             + f" -r {run_manifest}"
             + " --legacy-fastq"
             + " --force-index-orientation"
-        )  # TODO: any other options?
+        )
         with open(os.path.join(self.run_dir, ".bases2fastq_command")) as command_file:
             command_file.write(command)
         return command
@@ -1091,7 +1091,7 @@ def sync_metadata(self):
         ]
         metadata_archive = self.CONFIG.get("element_analysis").get(
             "metadata_location"
-        )  # TODO: add to taca.yaml
+        )
         dest = os.path.join(metadata_archive, self.NGI_run_id)
         os.makedirs(dest)
         for f in files_to_copy:
@@ -1104,7 +1104,7 @@ def make_transfer_indicator(self):
     def transfer(self):
         transfer_details = self.CONFIG.get("element_analysis").get(
             "transfer_details"
-        )  # TODO: Add section to taca.yaml
+        )
         command = (
             "rsync"
             + " -rLav"