Removed old classes that are no longer used