group cleanup
Merge pull request #473 from dimagi/cz-dev

group cleanup