Revert "add grouplist first"

This reverts commit 1a9195ee7c487dfbbf2eb068ff7858e9b1ff5568.