rpearce: Removing virtual_name_service, duplication?