Clean up old classes