sweeping changes (mostly removals)