Cleanup, removing old classes.