got rid of some unneeded classes