Revert "groups part 4"

This reverts commit 2c69de033856f632ea25d039d61697446ff39766.