Remove the hostname and api_version for now