revising TODOs by basically removing them