Revert "Create groups"

This reverts commit cc2bf31133e84ad6ad41a8ccf4205352d0fc6468.