diff --git a/src/calng/AgipdCorrection.py b/src/calng/AgipdCorrection.py
index 02cea77b12b81e038e770ffa8b101a60bdcecc02..fa8e074be01a36c4d7005450b2274d3d6c0453aa 100644
--- a/src/calng/AgipdCorrection.py
+++ b/src/calng/AgipdCorrection.py
@@ -227,7 +227,6 @@ class AgipdCorrection(BaseCorrection):
             # cell_table = cell_table[self.pulse_filter]
             pulse_table = np.squeeze(data.get("image.pulseId"))  # [self.pulse_filter]
             cell_table_max = np.max(cell_table)
-            # TODO: all this checking and warning can go into GPU runner
             if cell_table_max >= correction_cell_num:
                 self.log_status_info(
                     f"Max cell ID ({cell_table_max}) exceeds range for loaded "
@@ -247,7 +246,6 @@ class AgipdCorrection(BaseCorrection):
                 preview_slice_index = self._schema_cache["preview.pulse"]
                 if preview_slice_index >= 0:
                     # look at pulse_table to find which index this pulse ID is in
-                    # TODO: move this to GPU
                     pulse_id_found = np.where(pulse_table == preview_slice_index)[0]
                     if len(pulse_id_found) == 0:
                         pulse_found_instead = pulse_table[0]
diff --git a/src/calng/DsscCorrection.py b/src/calng/DsscCorrection.py
index 3c5b8f181fcb9f54cc9b81373ca9d732d29bb181..5dd32976a4a04a85e725a3f7daec6947ab433a5c 100644
--- a/src/calng/DsscCorrection.py
+++ b/src/calng/DsscCorrection.py
@@ -55,7 +55,6 @@ class DsscCorrection(BaseCorrection):
     def process_input(self, data, metadata):
         """Registered for dataInput, handles all processing and sending"""
 
-        # TODO: compare KARABO_ON_INPUT (old) against KARABO_ON_DATA (current)
         source = metadata.get("source")
 
         if source not in self.sources: