Removing unneeded classes