cleaning up old classes