Merge "Remove old TODO" into main