Removing auto generated TODOs