Merge "Remove redundant code"