Refactored to a remote service delegate instead of a remote service