Remove groupBy