Merge "Remove finished TODO" into main