Removing xroad service dependency