*8094* Remove groups cruft