Revert "Track own grouper"

This reverts commit 81e1512065780ad0ddea7f5151b9918a68d2d8cc.
Revert "Add back grouper"

This reverts commit f0f397c233633c9ea4a743d1e3a978adc14f707d.
Fix git location