Cleanup a bunch of TODOs