Remove state_code and country_code because they're not enabled by default