diff --git a/lib/src/backend.rs b/lib/src/backend.rs
index aa77a5c7e2..b33f7f3181 100644
--- a/lib/src/backend.rs
+++ b/lib/src/backend.rs
@@ -154,8 +154,6 @@ content_hash! {
 content_hash! {
     #[derive(Debug, PartialEq, Eq, Clone)]
     pub struct ConflictTerm {
-        // TODO: Store e.g. CommitId here too? Labels (theirs/ours/base)? Would those still be
-        //       useful e.g. after rebasing this conflict?
         pub value: TreeValue,
     }
 }
diff --git a/lib/src/rewrite.rs b/lib/src/rewrite.rs
index a2588ac2e6..04393fb119 100644
--- a/lib/src/rewrite.rs
+++ b/lib/src/rewrite.rs
@@ -81,7 +81,6 @@ pub fn rebase_commit(
     } else {
         let old_base_tree = merge_commit_trees(mut_repo, &old_parents)?;
         let new_base_tree = merge_commit_trees(mut_repo, new_parents)?;
-        // TODO: pass in labels for the merge parts
         let merged_tree = merge_trees(&new_base_tree, &old_base_tree, &old_commit.tree())?;
         merged_tree.id().clone()
     };
@@ -104,7 +103,6 @@ pub fn back_out_commit(
 ) -> Result<Commit, TreeMergeError> {
     let old_base_tree = merge_commit_trees(mut_repo, &old_commit.parents())?;
     let new_base_tree = merge_commit_trees(mut_repo, new_parents)?;
-    // TODO: pass in labels for the merge parts
     let new_tree = merge_trees(&new_base_tree, &old_commit.tree(), &old_base_tree).unwrap();
     let new_parent_ids = new_parents
         .iter()