Cleanup groupBy logic

[gusty]

There is some logic to remove groups and keep track of the key that at the moment is not necessary.