Delete class variables, return to old style