Merge "Add a cleanup TODO." into main