- removing some unneeded classes