Removed some old TODOs