removed a couple of vestigal classes