Merge "Remove obsolete TODO" into main