Remove dependence on CountryPicker. Close #4.