Removed usage of GroupsFinder

Merged yorickpeterse-staging requested to merge remove-groups-finder into master