Removed some old classes