Merge "Removal of methods from json/xml network_client files"