Revert "Add grouper"

This reverts commit 224bb103f9c17e12eaf0887c5eb54eba87ffa809.