Revert "Groups part 3"

This reverts commit f9e45f0051b477c64be3a321761163e8a831a3c2.
Revert f9e45f0..5d456ab

This rolls back to commit f9e45f0051b477c64be3a321761163e8a831a3c2.