removed old unneeded classes