Remove unnecessary friend classes.