[minor] removing some old TODOs