removed TODOs that are done