Removing irrelevant TODOs