Merge "remove obsolete TODOs"