Remove extraneous classes