change the groupings and remove old col thats not used