Update: instead of iterating all netgroups, add Provider.ForEach(layer, callback) method - get rid of Visibility.Manager.Groups accessor This removes public access to groups dictionary, so almost there to remove it Tests: booted to craggy, opened deep sea and ran deepsea.printentitycount