- removed some unneeded classes