removed some old classes