API-54 Move all proxy references to client library