Removed a bunch of useless TODOs