Removed some old classes not used