diff --git a/src/ast/printer/mod.rs b/src/ast/printer/mod.rs
index 03aba29..ccac6be 100644
--- a/src/ast/printer/mod.rs
+++ b/src/ast/printer/mod.rs
@@ -16,9 +16,6 @@ use std::io::Write;
 use crate::ast::*;
 use crate::parse::CommentMap;
 
-// TODO(jwall): We really need a way to preserve comments for these.
-// Perhaps for code formatting we actually want to work on the token stream instead?
-
 pub struct AstPrinter<'a, W>
 where
     W: Write,
diff --git a/src/convert/yaml.rs b/src/convert/yaml.rs
index 97f1625..1dbe33a 100644
--- a/src/convert/yaml.rs
+++ b/src/convert/yaml.rs
@@ -91,7 +91,6 @@ impl YamlConverter {
                 }
             };
             if key == "<<" {
-                // TODO(jwall): Handle merge keys
                 if let serde_yaml::Value::Mapping(merge_map) = value {
                     self.merge_mapping_keys(&mut fs, merge_map)?;
                 }
diff --git a/src/main.rs b/src/main.rs
index 6514a1c..2a5c076 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -591,7 +591,6 @@ fn do_repl<C: Cache>(
     loop {
         // print prompt
         let line = editor.readline(&format!("{}> ", lines.next_line()))?;
-        // TODO check for a repl command.
         // repl commands are only valid while not accumulating a statement;
         let trimmed = line.trim();
         if trimmed.starts_with("#") {