Remove country code because location is a country

There's probably a better way to handle this case, and other custom cases. See #162