Cleanup old classes