Remove unneeded classes