remove Grouped Customer
refactored grouper and tests