Cleans up some old TODOs which are done.