Merge "Remove get_remote_client method"