Removed simple TODOs