Remove some unneeded TODOs