Merge "Remove obsolete TODO comments"