removed two class variables.