Removed old classes/tests