Removed remote service dependency