Removed more leftover TODOs