more clean up of grouping poc artifacts ...