Remove some uneeded classes