Got rid of some unneeded TODOs