diff --git a/anglerfish/demux/adaptor.py b/anglerfish/demux/adaptor.py
index ea369fb..69e7ea1 100644
--- a/anglerfish/demux/adaptor.py
+++ b/anglerfish/demux/adaptor.py
@@ -131,7 +131,6 @@ def load_adaptors(raw=False):
         return adaptors_raw
     adaptors = []
     for adaptor in adaptors_raw:
-        # This is now broken, I think
         adaptors.append(
             Adaptor(adaptors_raw, "N", adaptor, i7_index=None, i5_index=None)
         )
diff --git a/anglerfish/demux/samplesheet.py b/anglerfish/demux/samplesheet.py
index 60dc324..f01c9cc 100644
--- a/anglerfish/demux/samplesheet.py
+++ b/anglerfish/demux/samplesheet.py
@@ -12,7 +12,7 @@
 udelim = re.compile(r"(\<U\d+\>)")
 ulen = re.compile(r"\<U(\d+)\>")
 adaptors = load_adaptors(raw=True)
-# Holy merge conflict, Batman! Fix this later
+# This is some leftover ugliness from a merge conflict to reconcile the old and new adaptor classes
 delim = "<N>"