Merge "Remove unnecessary class variable"