Get rid of the class