Merge "Remove unnecessary class variables"