Moving to centralized ServiceClient refs
15 files changed