Merge "Remove outdated TODO" into main