remove ancient TODOs [ci skip].
Merge pull request #9766 from senny/remove_ancient_todos

Remove ancient TODOs [ci skip]