Remove group-by since that's been covered