Merge "Remove duplicated class variable"