implemented and deleted TODOs