Merge "Simplify and remove old comment"