Removed old classes (Which have been moved)