Remove unneeded grouping