removed TODOs completed