Model updated

Added PK codes to city, state, country. Removed payment data.