OTHER: Update to current service client API and clean redundant code.