more cleanup, removing unused grouping POC code ...