remove some unneeded classes