removed TODOs that weren't needed anymore