*8094* Remove group cruft