removed some old TODOs