removed extraneous classes