Revert "Some work on groups"

This reverts commit 3ac348e898c94087c78f081a3842c0d54d2e4baf.