Revert "incorrect group mamagement"

This reverts commit 236d6a50949970739362c4724a1f1a0953d4f083.
Revert "group management try 1"

This reverts commit 4be7eb0ed64f26ed2f33385681f2311894aff608.