Get rid of extraneous classes...