removal of TODOs