Remove country_code & country_name for now