Remove basic grouping behavior functionality

We're going to rework the grouping behavior and get it done the right
way.