Merge "Remove stale TODO." into main