Remove avg, fix groupBy()