Remove code used with Grouper data source (CO-443)