Merge "Remove stale TODOs" into main