Cleanup, removing unnecessary classes.