More JsonClientDelegate cleanup