Removed some old TODOs and added some new TODOs