Merge "Remove unused class variables"