Remove extraneous code. Back to basics.
Add back the group helper.