Update state_id and country_iso_code with proper definition
Fix bogus belongs_to copy and waste