Removed extraneous classes