remove some very horrible code, a little work toward merging multiple groupings but it's too difficult for this ticket, fixes #157
Merge pull request #162 from jdegoes/ready/157

remove some very horrible code, a little work toward merging multiple gr...