Revert "add group id and fix popup"

This reverts commit 38163f28712c31b8598f8549fcce3a6871d53714.