get rid of unneeded class