Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8069)
@@ -34,6 +34,5 @@
 from waeup.kofa.payments.interfaces import IOnlinePayment
 from waeup.kofa.schoolgrades import ResultEntryField
-from waeup.kofa.students.vocabularies import (
-    lgas_vocab, GenderSource)
+from waeup.kofa.students.vocabularies import GenderSource
 from waeup.kofa.university.vocabularies import (
     course_levels, AppCatSource, CertificateSource)
@@ -343,10 +342,4 @@
         required = True,
         )
-    lga = schema.Choice(
-        source = lgas_vocab,
-        title = _(u'State/LGA'),
-        default = 'foreigner',
-        required = False,
-        )
     sex = schema.Choice(
         title = _(u'Sex'),
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py	(revision 8069)
@@ -157,5 +157,4 @@
         self.browser.getControl(name="form.course1").value = ['CERT1']
         self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
-        self.browser.getControl(name="form.lga").value = ['foreigner']
         self.browser.getControl(name="form.sex").value = ['m']
         self.browser.getControl(name="form.email").value = 'xx@yy.zz'
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py	(revision 8069)
@@ -140,5 +140,5 @@
             'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,lga,locked,middlename,notice,password,phone,'
+            'history,lastname,locked,middlename,notice,password,phone,'
             'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
@@ -147,5 +147,5 @@
         self.assertTrue(
             'Application initialized by system\'],Tester,'
-            'foreigner,0,,,,,,,,,initialized,\r\n'
+            '0,,,,,,,,,initialized,\r\n'
             in result)
         return
@@ -164,5 +164,5 @@
             'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,lga,locked,middlename,notice,password,phone,'
+            'history,lastname,locked,middlename,notice,password,phone,'
             'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
@@ -172,5 +172,5 @@
         self.assertTrue(
             'Application initialized by system\'],'
-            'Tester,foreigner,0,M.,"Some notice\nin lines.",any password,'
+            'Tester,0,M.,"Some notice\nin lines.",any password,'
             '+234-123-12345,123456,98,Exam Room,f,initialized,\r\n'
             in result)
@@ -188,5 +188,5 @@
             'applicant_id,application_date,application_number,course1,course2,'
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
-            'history,lastname,lga,locked,middlename,notice,password,phone,'
+            'history,lastname,locked,middlename,notice,password,phone,'
             'reg_number,screening_score,screening_venue,sex,state,'
             'student_id\r\n'
@@ -196,5 +196,5 @@
         self.assertTrue(
             'Application initialized by system\'],'
-            'Tester,foreigner,0,M.,"Some notice\nin lines.",any password,'
+            'Tester,0,M.,"Some notice\nin lines.",any password,'
             '+234-123-12345,123456,98,Exam Room,f,initialized,\r\n'
             in result)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 8069)
@@ -232,7 +232,6 @@
 
     nationality = schema.Choice(
-        source = nats_vocab,
+        vocabulary = nats_vocab,
         title = _(u'Nationality'),
-        default = 'nigeria',
         required = False,
         )
Index: in/waeup.kofa/trunk/src/waeup/kofa/students/lgas.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/lgas.py	(revision 8068)
+++ 	(revision )
@@ -1,881 +1,0 @@
-LGAS = (
-    ('abia_aba_north','Abia / Aba North'),
-    ('abia_aba_south','Abia / Aba South'),
-    ('abia_arochukwu','Abia / Arochukwu'),
-    ('abia_bende','Abia / Bende'),
-    ('abia_ikawuno','Abia / Ikawuno'),
-    ('abia_ikwuano','Abia / Ikwuano'),
-    ('abia_isiala-ngwa-north','Abia / Isiala-Ngwa-North'),
-    ('abia_isiala-ngwa-south','Abia / Isiala-Ngwa-South'),
-    ('abia_isikwuato','Abia / Isikwuato'),
-    ('abia_isuikwuato','Abia / Isuikwuato'),
-    ('abia_nneochi','Abia / Nneochi'),
-    ('abia_obi_ngwa','Abia / Obi Ngwa'),
-    ('abia_obioma_ngwa_','Abia / Obioma Ngwa'),
-    ('abia_obioma-ngwa','Abia / Obioma-Ngwa'),
-    ('abia_ohafia','Abia / Ohafia'),
-    ('abia_ohaozara','Abia / Ohaozara'),
-    ('abia_osisioma','Abia / Osisioma'),
-    ('abia_ugwunagbo','Abia / Ugwunagbo'),
-    ('abia_ukwa_west','Abia / Ukwa West'),
-    ('abia_ukwu_east','Abia / Ukwu East'),
-    ('abia_umuahia','Abia / Umuahia'),
-    ('abia_umuahia_south','Abia / Umuahia South'),
-    ('abia_umuahia-north','Abia / Umuahia-North'),
-    ('abuja_abaji','Abuja / Abaji'),
-    ('abuja_amac','Abuja / Amac'),
-    ('abuja_bwari','Abuja / Bwari'),
-    ('abuja_kuje','Abuja / Kuje'),
-    ('abuja_gwagwalada','Abuja / Gwagwalada'),
-    ('abuja_kwali','Abuja / Kwali'),
-    ('abuja_municipal','Abuja / Municipal'),
-    ('adamawa_demsa','Adamawa / Demsa'),
-    ('adamawa_fufore','Adamawa / Fufore'),
-    ('adamawa_ganye','Adamawa / Ganye'),
-    ('adamawa_girei','Adamawa / Girei'),
-    ('adamawa_gombi','Adamawa / Gombi'),
-    ('adamawa_guyuk','Adamawa / Guyuk'),
-    ('adamawa_hong','Adamawa / Hong'),
-    ('adamawa_jada','Adamawa / Jada'),
-    ('adamawa_jimeta','Adamawa / Jimeta'),
-    ('adamawa_lamurde','Adamawa / Lamurde'),
-    ('adamawa_madagali','Adamawa / Madagali'),
-    ('adamawa_maiha','Adamawa / Maiha'),
-    ('adamawa_mayo-belwa','Adamawa / Mayo-Belwa'),
-    ('adamawa_michika','Adamawa / Michika'),
-    ('adamawa_mubi-north','Adamawa / Mubi-North'),
-    ('adamawa_mubi-south','Adamawa / Mubi-South'),
-    ('adamawa_numan','Adamawa / Numan'),
-    ('adamawa_shelleng','Adamawa / Shelleng'),
-    ('adamawa_song','Adamawa / Song'),
-    ('adamawa_toungo','Adamawa / Toungo'),
-    ('adamawa_yola','Adamawa / Yola'),
-    ('akwa_ibom_abak','Akwa Ibom / Abak'),
-    ('akwa_ibom_eastern-obolo','Akwa Ibom / Eastern-Obolo'),
-    ('akwa_ibom_eket','Akwa Ibom / Eket'),
-    ('akwa_ibom_ekpe-atani','Akwa Ibom / Ekpe-Atani'),
-    ('akwa_ibom_esit_ekit','Akwa Ibom / Esit Ekit'),
-    ('akwa_ibom_essien-udim','Akwa Ibom / Essien-Udim'),
-    ('akwa_ibom_etim-ekpo','Akwa Ibom / Etim-Ekpo'),
-    ('akwa_ibom_etinam','Akwa Ibom / Etinam'),
-    ('akwa_ibom_ibeno','Akwa Ibom / Ibeno'),
-    ('akwa_ibom_ibesikpo-asutan','Akwa Ibom / Ibesikpo-Asutan'),
-    ('akwa_ibom_ibiono-ibom','Akwa Ibom / Ibiono-Ibom'),
-    ('akwa_ibom_ika','Akwa Ibom / Ika'),
-    ('akwa_ibom_ikono','Akwa Ibom / Ikono'),
-    ('akwa_ibom_ikot-abasi','Akwa Ibom / Ikot-Abasi'),
-    ('akwa_ibom_ikot-ekpene','Akwa Ibom / Ikot-Ekpene'),
-    ('akwa_ibom_ini','Akwa Ibom / Ini'),
-    ('akwa_ibom_itu','Akwa Ibom / Itu'),
-    ('akwa_ibom_mbo','Akwa Ibom / Mbo'),
-    ('akwa_ibom_mkpat-enin','Akwa Ibom / Mkpat-Enin'),
-    ('akwa_ibom_nsit-ibom','Akwa Ibom / Nsit-Ibom'),
-    ('akwa_ibom_nsit-ubium','Akwa Ibom / Nsit-Ubium'),
-    ('akwa_ibom_obot-akara','Akwa Ibom / Obot-Akara'),
-    ('akwa_ibom_okobo','Akwa Ibom / Okobo'),
-    ('akwa_ibom_onna','Akwa Ibom / Onna'),
-    ('akwa_ibom_oron','Akwa Ibom / Oron'),
-    ('akwa_ibom_oruk_anam','Akwa Ibom / Oruk-Anam'),
-    ('akwa_ibom_udung-uko','Akwa Ibom / Udung-Uko'),
-    ('akwa_ibom_ukanefun','Akwa Ibom / Ukanefun'),
-    ('akwa_ibom_uquo_ibeno','Akwa Ibom / Uquo Ibeno'),
-    ('akwa_ibom_urue-offong-oruko','Akwa Ibom / Urue-Offong-Oruko'),
-    ('akwa_ibom_uruan','Akwa Ibom / Uruan'),
-    ('akwa_ibom_uruk-anam','Akwa Ibom / Uruk-Anam'),
-    ('akwa_ibom_uyo','Akwa Ibom / Uyo'),
-    ('anambra_aguata','Anambra / Aguata'),
-    ('anambra_anambra-east','Anambra / Anambra-East'),
-    ('anambra_anambra-west','Anambra / Anambra-West'),
-    ('anambra_anaocha','Anambra / Anaocha'),
-    ('anambra_awka-north','Anambra / Awka-North'),
-    ('anambra_awka-south','Anambra / Awka-South'),
-    ('anambra_ayamelum','Anambra / Ayamelum'),
-    ('anambra_dunukofia','Anambra / Dunukofia'),
-    ('anambra_ekwusigo','Anambra / Ekwusigo'),
-    ('anambra_idemili','Anambra / Idemili'),
-    ('anambra_idemili-north','Anambra / Idemili-North'),
-    ('anambra_idemili-south','Anambra / Idemili-South'),
-    ('anambra_ihiala','Anambra / Ihiala'),
-    ('anambra_nibo','Anambra / Nibo'),
-    ('anambra_njikoka','Anambra / Njikoka'),
-    ('anambra_nnewi','Anambra / Nnewi'),
-    ('anambra_nnewi-north','Anambra / Nnewi-North'),
-    ('anambra_nnewi-south','Anambra / Nnewi-South'),
-    ('anambra_ogbaru','Anambra / Ogbaru'),
-    ('anambra_olumba','Anambra / Olumba'),
-    ('anambra_onitsha-north','Anambra / Onitsha-North'),
-    ('anambra_onitsha-south','Anambra / Onitsha-South'),
-    ('anambra_orumba-north','Anambra / Orumba-North'),
-    ('anambra_orumba-south','Anambra / Orumba-South'),
-    ('anambra_oti','Anambra / Oti'),
-    ('anambra_oyi','Anambra / Oyi'),
-    ('anambra_ubuluizor-ihiala','Anambra / Ubuluizor-Ihiala'),
-    ('anambra_uyi','Anambra / Uyi'),
-    ('bauchi_alkaleri','Bauchi / Alkaleri'),
-    ('bauchi_bauchi','Bauchi / Bauchi'),
-    ('bauchi_bogoro','Bauchi / Bogoro'),
-    ('bauchi_damban','Bauchi / Damban'),
-    ('bauchi_darazo','Bauchi / Darazo'),
-    ('bauchi_dass','Bauchi / Dass'),
-    ('bauchi_gamawa','Bauchi / Gamawa'),
-    ('bauchi_ganjuwa','Bauchi / Ganjuwa'),
-    ('bauchi_giade','Bauchi / Giade'),
-    ('bauchi_itas/gadau','Bauchi / Itas/Gadau'),
-    ('bauchi_jamaare','Bauchi / Jamaare'),
-    ('bauchi_katagum','Bauchi / Katagum'),
-    ('bauchi_kirfi','Bauchi / Kirfi'),
-    ('bauchi_misau','Bauchi / Misau'),
-    ('bauchi_ningi','Bauchi / Ningi'),
-    ('bauchi_shira','Bauchi / Shira'),
-    ('bauchi_tafawa-balewa','Bauchi / Tafawa-Balewa'),
-    ('bauchi_toro','Bauchi / Toro'),
-    ('bauchi_warji','Bauchi / Warji'),
-    ('bauchi_zaki','Bauchi / Zaki'),
-    ('bayelsa_brass','Bayelsa / Brass'),
-    ('bayelsa_ekeremor','Bayelsa / Ekeremor'),
-    ('bayelsa_kembe','Bayelsa / Kembe'),
-    ('bayelsa_kolokuma','Bayelsa / Kolokuma'),
-    ('bayelsa_kolokuma/opkuma','Bayelsa / Kolokuma/Opkuma'),
-    ('bayelsa_nembe','Bayelsa / Nembe'),
-    ('bayelsa_ogbia','Bayelsa / Ogbia'),
-    ('bayelsa_sagbama','Bayelsa / Sagbama'),
-    ('bayelsa_southern-ijaw','Bayelsa / Southern-Ijaw'),
-    ('bayelsa_toru-abubo','Bayelsa / Toru-Abubo'),
-    ('bayelsa_yenegoa','Bayelsa / Yenegoa'),
-    ('benue_ado','Benue / Ado'),
-    ('benue_agatu','Benue / Agatu'),
-    ('benue_apa','Benue / Apa'),
-    ('benue_buruku','Benue / Buruku'),
-    ('benue_gboko','Benue / Gboko'),
-    ('benue_guma','Benue / Guma'),
-    ('benue_gwer-east','Benue / Gwer-East'),
-    ('benue_gwer-west','Benue / Gwer-West'),
-    ('benue_katsina-ala','Benue / Katsina-Ala'),
-    ('benue_konshisha','Benue / Konshisha'),
-    ('benue_kwande','Benue / Kwande'),
-    ('benue_logo','Benue / Logo'),
-    ('benue_makurdi','Benue / Makurdi'),
-    ('benue_ogbadibo','Benue / Ogbadibo'),
-    ('benue_ohimini','Benue / Ohimini'),
-    ('benue_oju','Benue / Oju'),
-    ('benue_okpokwu','Benue / Okpokwu'),
-    ('benue_otukpo','Benue / Otukpo'),
-    ('benue_oturkpa','Benue / Oturkpa'),
-    ('benue_tarka','Benue / Tarka'),
-    ('benue_ukum','Benue / Ukum'),
-    ('benue_ushongo','Benue / Ushongo'),
-    ('benue_vandeikya','Benue / Vandeikya'),
-    ('borno_abadan','Borno / Abadan'),
-    ('borno_askira-uba','Borno / Askira-Uba'),
-    ('borno_bama','Borno / Bama'),
-    ('borno_bayo','Borno / Bayo'),
-    ('borno_biu','Borno / Biu'),
-    ('borno_chibok','Borno / Chibok'),
-    ('borno_damboa','Borno / Damboa'),
-    ('borno_dikwa','Borno / Dikwa'),
-    ('borno_gubio','Borno / Gubio'),
-    ('borno_guzamala','Borno / Guzamala'),
-    ('borno_gwoza','Borno / Gwoza'),
-    ('borno_hawul','Borno / Hawul'),
-    ('borno_jere','Borno / Jere'),
-    ('borno_kaga','Borno / Kaga'),
-    ('borno_kala/balge','Borno / Kala/Balge'),
-    ('borno_konduga','Borno / Konduga'),
-    ('borno_kukawa','Borno / Kukawa'),
-    ('borno_kwaya-kusar','Borno / Kwaya-Kusar'),
-    ('borno_mafa','Borno / Mafa'),
-    ('borno_magumeri','Borno / Magumeri'),
-    ('borno_maiduguri','Borno / Maiduguri'),
-    ('borno_marte','Borno / Marte'),
-    ('borno_mobbar','Borno / Mobbar'),
-    ('borno_mongunu','Borno / Mongunu'),
-    ('borno_ngala','Borno / Ngala'),
-    ('borno_nganzai','Borno / Nganzai'),
-    ('borno_shani','Borno / Shani'),
-    ('cross_river_abi','Cross River / Abi'),
-    ('cross_river_abuochichie','Cross River / Abuochichie'),
-    ('cross_river_akamkpa','Cross River / Akamkpa'),
-    ('cross_river_akpabuyo','Cross River / Akpabuyo'),
-    ('cross_river_bakassi','Cross River / Bakassi'),
-    ('cross_river_bekwara','Cross River / Bekwara'),
-    ('cross_river_biasi','Cross River / Biasi'),
-    ('cross_river_boki','Cross River / Boki'),
-    ('cross_river_calabar-municipal','Cross River / Calabar-Municipal'),
-    ('cross_river_calabar-south','Cross River / Calabar-South'),
-    ('cross_river_etunk','Cross River / Etunk'),
-    ('cross_river_ikom','Cross River / Ikom'),
-    ('cross_river_obanliku','Cross River / Obanliku'),
-    ('cross_river_obubra','Cross River / Obubra'),
-    ('cross_river_obudu','Cross River / Obudu'),
-    ('cross_river_odukpani','Cross River / Odukpani'),
-    ('cross_river_ogoja','Cross River / Ogoja'),
-    ('cross_river_ugep-north','Cross River / Ugep-North'),
-    ('cross_river_yakurr','Cross River / Yakurr'),
-    ('cross_river_yala','Cross River / Yala'),
-    ('delta_aniocha-north','Delta / Aniocha-North'),
-    ('delta_aniocha-south','Delta / Aniocha-South'),
-    ('delta_bomadi','Delta / Bomadi'),
-    ('delta_burutu','Delta / Burutu'),
-    ('delta_effurun','Delta / Effurun'),
-    ('delta_ethiope-east','Delta / Ethiope-East'),
-    ('delta_ethiope-west','Delta / Ethiope-West'),
-    ('delta_idu','Delta / Idu'),
-    ('delta_ika-ne','Delta / Ika-Ne'),
-    ('delta_ika-north-east','Delta / Ika-North-East'),
-    ('delta_ika-south','Delta / Ika-South'),
-    ('delta_idemili-south','Delta / Idemili-South'),
-    ('delta_isoko-north','Delta / Isoko-North'),
-    ('delta_isoko-south','Delta / Isoko-South'),
-    ('delta_ndokwa-east','Delta / Ndokwa-East'),
-    ('delta_ndokwa-north','Delta / Ndokwa-North'),
-    ('delta_ndokwa-south','Delta / Ndokwa-South'),
-    ('delta_ndokwa-west','Delta / Ndokwa-West'),
-    ('delta_okpe','Delta / Okpe'),
-    ('delta_okwuani','Delta / Okwuani'),
-    ('delta_oleh','Delta / Oleh'),
-    ('delta_oshielli-north','Delta / Oshielli-North'),
-    ('delta_oshimili','Delta / Oshimili'),
-    ('delta_oshimili-north','Delta / Oshimili-North'),
-    ('delta_oshimili-south','Delta / Oshimili-South'),
-    ('delta_osimili','Delta / Osimili'),
-    ('delta_osimili-north','Delta / Osimili-North'),
-    ('delta_osimili-south','Delta / Osimili-South'),
-    ('delta_patani','Delta / Patani'),
-    ('delta_sapele','Delta / Sapele'),
-    ('delta_udokwa','Delta / Udokwa'),
-    ('delta_udu','Delta / Udu'),
-    ('delta_ughelli-north','Delta / Ughelli-North'),
-    ('delta_ughelli-south','Delta / Ughelli-South'),
-    ('delta_ukwuani','Delta / Ukwuani'),
-    ('delta_urwie','Delta / Urwie'),
-    ('delta_uvie','Delta / Uvie'),
-    ('delta_uvwei','Delta / Uvwei'),
-    ('delta_uvwie','Delta / Uvwie'),
-    ('delta_warri-central','Delta / Warri-Central'),
-    ('delta_warri-north','Delta / Warri-North'),
-    ('delta_warri-south','Delta / Warri-South'),
-    ('delta_warri-south-west','Delta / Warri-South-West'),
-    ('ebonyi_abakaliki','Ebonyi / Abakaliki'),
-    ('ebonyi_afikpo-north','Ebonyi / Afikpo-North'),
-    ('ebonyi_afikpo-south','Ebonyi / Afikpo-South'),
-    ('ebonyi_bomadim','Ebonyi / Bomadim'),
-    ('ebonyi_ebonyi','Ebonyi / Ebonyi'),
-    ('ebonyi_ezza-north','Ebonyi / Ezza-North'),
-    ('ebonyi_ezza-south','Ebonyi / Ezza-South'),
-    ('ebonyi_ikwo','Ebonyi / Ikwo'),
-    ('ebonyi_ishielu','Ebonyi / Ishielu'),
-    ('ebonyi_ivo','Ebonyi / Ivo'),
-    ('ebonyi_izzi','Ebonyi / Izzi'),
-    ('ebonyi_obaukwu','Ebonyi / Obaukwu'),
-    ('ebonyi_ohakwu','Ebonyi / Ohakwu'),
-    ('ebonyi_ohaozara','Ebonyi / Ohaozara'),
-    ('ebonyi_onicha','Ebonyi / Onicha'),
-    ('ebonyi_ukaba','Ebonyi / Ukaba'),
-    ('edo_afokpella','Edo / Afokpella'),
-    ('edo_afuze','Edo / Afuze'),
-    ('edo_agbazilo','Edo / Agbazilo'),
-    ('edo_akoko-edo','Edo / Akoko-Edo'),
-    ('edo_egor','Edo / Egor'),
-    ('edo_esan-central','Edo / Esan-Central'),
-    ('edo_esan-north-east','Edo / Esan-North-East'),
-    ('edo_esan-north-west','Edo / Esan-North-West'),
-    ('edo_esan-south-east','Edo / Esan-South-East'),
-    ('edo_esan-west','Edo / Esan-West'),
-    ('edo_etsako-central','Edo / Etsako-Central'),
-    ('edo_etsako-east','Edo / Etsako-East'),
-    ('edo_etsako-west','Edo / Etsako-West'),
-    ('edo_igueben','Edo / Igueben'),
-    ('edo_ikpoba-okha','Edo / Ikpoba-Okha'),
-    ('edo_ohunmwode','Edo / Ohunmwode'),
-    ('edo_ologbo','Edo / Ologbo'),
-    ('edo_opoji_irrua','Edo / Opoji Irrua'),
-    ('edo_oredo','Edo / Oredo'),
-    ('edo_orhionmwon','Edo / Orhionmwon'),
-    ('edo_ovia-north-east','Edo / Ovia-North-East'),
-    ('edo_ovia-south-west','Edo / Ovia-South-West'),
-    ('edo_owan-east','Edo / Owan-East'),
-    ('edo_owan-west','Edo / Owan-West'),
-    ('edo_uhunmwonde','Edo / Uhunmwonde'),
-    ('ekiti_ado-ekiti','Ekiti / Ado-Ekiti'),
-    ('ekiti_aiyekire','Ekiti / Aiyekire'),
-    ('ekiti_efon','Ekiti / Efon'),
-    ('ekiti_ekiti-east','Ekiti / Ekiti-East'),
-    ('ekiti_ekiti-south-west','Ekiti / Ekiti-South-West'),
-    ('ekiti_ekiti-west','Ekiti / Ekiti-West'),
-    ('ekiti_emure/ise/orun','Ekiti / Emure/Ise/Orun'),
-    ('ekiti_gbonyin','Ekiti / Gbonyin'),
-    ('ekiti_ido-osi','Ekiti / Ido-Osi'),
-    ('ekiti_ijero','Ekiti / Ijero'),
-    ('ekiti_ikare','Ekiti / Ikare'),
-    ('ekiti_ikere','Ekiti / Ikere'),
-    ('ekiti_ikole','Ekiti / Ikole'),
-    ('ekiti_ilejemeje','Ekiti / Ilejemeje'),
-    ('ekiti_irepodun/ifelodun','Ekiti / Irepodun/Ifelodun'),
-    ('ekiti_ise-orun','Ekiti / Ise-Orun'),
-    ('ekiti_moba','Ekiti / Moba'),
-    ('ekiti_oye','Ekiti / Oye'),
-    ('enugu_aninri','Enugu / Aninri'),
-    ('enugu_awgu','Enugu / Awgu'),
-    ('enugu_enugu-east','Enugu / Enugu-East'),
-    ('enugu_enugu-north','Enugu / Enugu-North'),
-    ('enugu_enugu-south','Enugu / Enugu-South'),
-    ('enugu_ezeagu','Enugu / Ezeagu'),
-    ('enugu_igbo-etiti','Enugu / Igbo-Etiti'),
-    ('enugu_igbo-eze-north','Enugu / Igbo-Eze-North'),
-    ('enugu_igbo-eze-south','Enugu / Igbo-Eze-South'),
-    ('enugu_isi-uzo','Enugu / Isi-Uzo'),
-    ('enugu_nkanu-east','Enugu / Nkanu-East'),
-    ('enugu_nkanu-west','Enugu / Nkanu-West'),
-    ('enugu_nsukka','Enugu / Nsukka'),
-    ('enugu_nukanu_east','Enugu / Nukanu East'),
-    ('enugu_oji-river','Enugu / Oji-River'),
-    ('enugu_udenu','Enugu / Udenu'),
-    ('enugu_udi','Enugu / Udi'),
-    ('enugu_uzo-uwani','Enugu / Uzo-Uwani'),
-    ('gombe_akko','Gombe / Akko'),
-    ('gombe_balanga','Gombe / Balanga'),
-    ('gombe_billiri','Gombe / Billiri'),
-    ('gombe_dukku','Gombe / Dukku'),
-    ('gombe_funakaye','Gombe / Funakaye'),
-    ('gombe_gombe','Gombe / Gombe'),
-    ('gombe_kaltungo','Gombe / Kaltungo'),
-    ('gombe_kwami','Gombe / Kwami'),
-    ('gombe_nafada/bajoga','Gombe / Nafada/Bajoga'),
-    ('gombe_shomgom','Gombe / Shomgom'),
-    ('gombe_yamaltu/deba','Gombe / Yamaltu/Deba'),
-    ('imo_aboh-mbaise','Imo / Aboh-Mbaise'),
-    ('imo_ahiazu-mbaise','Imo / Ahiazu-Mbaise'),
-    ('imo_dral-esat','Imo / Dral-Esat'),
-    ('imo_ehime-mbano','Imo / Ehime-Mbano'),
-    ('imo_ezinihitte','Imo / Ezinihitte'),
-    ('imo_ideato','Imo / Ideato'),
-    ('imo_ideato-north','Imo / Ideato-North'),
-    ('imo_ideato-south','Imo / Ideato-South'),
-    ('imo_ihitte/uboma','Imo / Ihitte/Uboma'),
-    ('imo_ikeduru','Imo / Ikeduru'),
-    ('imo_isiala-mbano','Imo / Isiala-Mbano'),
-    ('imo_isu','Imo / Isu'),
-    ('imo_mbaitoli','Imo / Mbaitoli'),
-    ('imo_mbano','Imo / Mbano'),
-    ('imo_ngor-okpala','Imo / Ngor-Okpala'),
-    ('imo_njaba','Imo / Njaba'),
-    ('imo_nkwerre','Imo / Nkwerre'),
-    ('imo_nwangele','Imo / Nwangele'),
-    ('imo_obowo','Imo / Obowo'),
-    ('imo_oguta','Imo / Oguta'),
-    ('imo_ohaji-egbema','Imo / Ohaji-Egbema'),
-    ('imo_okigwe','Imo / Okigwe'),
-    ('imo_onuimo','Imo / Onuimo'),
-    ('imo_orlu','Imo / Orlu'),
-    ('imo_orsu','Imo / Orsu'),
-    ('imo_oru-east','Imo / Oru-East'),
-    ('imo_oru-west','Imo / Oru-West'),
-    ('imo_owerri-municipal','Imo / Owerri-Municipal'),
-    ('imo_owerri-north','Imo / Owerri-North'),
-    ('imo_owerri-west','Imo / Owerri-West'),
-    ('imo_ugiri-ike_ikeduru','Imo / Ugiri-Ike Ikeduru'),
-    ('imo_ugiri-ikedikeduru','Imo / Ugiri-Ikedikeduru'),
-    ('imo_unbano','Imo / Unbano'),
-    ('imo_zinihitte','Imo / Zinihitte'),
-    ('jigawa_auyo','Jigawa / Auyo'),
-    ('jigawa_babura','Jigawa / Babura'),
-    ('jigawa_biriniwa','Jigawa / Biriniwa'),
-    ('jigawa_birnin-kudu','Jigawa / Birnin-Kudu'),
-    ('jigawa_bosuwa','Jigawa / Bosuwa'),
-    ('jigawa_buji','Jigawa / Buji'),
-    ('jigawa_dutse','Jigawa / Dutse'),
-    ('jigawa_gagarawa','Jigawa / Gagarawa'),
-    ('jigawa_garki','Jigawa / Garki'),
-    ('jigawa_gumel','Jigawa / Gumel'),
-    ('jigawa_guri','Jigawa / Guri'),
-    ('jigawa_gwaram','Jigawa / Gwaram'),
-    ('jigawa_gwiwa','Jigawa / Gwiwa'),
-    ('jigawa_hadejia','Jigawa / Hadejia'),
-    ('jigawa_jahun','Jigawa / Jahun'),
-    ('jigawa_kafin-hausa','Jigawa / Kafin-Hausa'),
-    ('jigawa_kaugama','Jigawa / Kaugama'),
-    ('jigawa_kazaure','Jigawa / Kazaure'),
-    ('jigawa_kirkasamma','Jigawa / Kirkasamma'),
-    ('jigawa_maigatari','Jigawa / Maigatari'),
-    ('jigawa_malam-maduri','Jigawa / Malam-Maduri'),
-    ('jigawa_miga','Jigawa / Miga'),
-    ('jigawa_ringim','Jigawa / Ringim'),
-    ('jigawa_roni','Jigawa / Roni'),
-    ('jigawa_sule-tankarkar','Jigawa / Sule-Tankarkar'),
-    ('jigawa_taura','Jigawa / Taura'),
-    ('jigawa_yankwashi','Jigawa / Yankwashi'),
-    ('kaduna_birnin-gwari','Kaduna / Birnin-Gwari'),
-    ('kaduna_chikun','Kaduna / Chikun'),
-    ('kaduna_giwa','Kaduna / Giwa'),
-    ('kaduna_gwagwada','Kaduna / Gwagwada'),
-    ('kaduna_igabi','Kaduna / Igabi'),
-    ('kaduna_ikara','Kaduna / Ikara'),
-    ('kaduna_jaba','Kaduna / Jaba'),
-    ('kaduna_jemaa','Kaduna / Jemaa'),
-    ('kaduna_kachia','Kaduna / Kachia'),
-    ('kaduna_kaduna-north','Kaduna / Kaduna-North'),
-    ('kaduna_kagarko','Kaduna / Kagarko'),
-    ('kaduna_kajuru','Kaduna / Kajuru'),
-    ('kaduna_kaura','Kaduna / Kaura'),
-    ('kaduna_kauru','Kaduna / Kauru'),
-    ('kaduna_koka/kawo','Kaduna / Koka/Kawo'),
-    ('kaduna_kubah','Kaduna / Kubah'),
-    ('kaduna_kudan','Kaduna / Kudan'),
-    ('kaduna_lere','Kaduna / Lere'),
-    ('kaduna_makarfi','Kaduna / Makarfi'),
-    ('kaduna_sabon-gari','Kaduna / Sabon-Gari'),
-    ('kaduna_sanga','Kaduna / Sanga'),
-    ('kaduna_soba','Kaduna / Soba'),
-    ('kaduna_tudun-wada/makera','Kaduna / Tudun-Wada/Makera'),
-    ('kaduna_zango-kataf','Kaduna / Zango-Kataf'),
-    ('kaduna_zaria','Kaduna / Zaria'),
-    ('kano_ajingi','Kano / Ajingi'),
-    ('kano_albasu','Kano / Albasu'),
-    ('kano_bagwai','Kano / Bagwai'),
-    ('kano_bebeji','Kano / Bebeji'),
-    ('kano_bichi','Kano / Bichi'),
-    ('kano_bunkure','Kano / Bunkure'),
-    ('kano_dala','Kano / Dala'),
-    ('kano_dambatta','Kano / Dambatta'),
-    ('kano_dawakin-kudu','Kano / Dawakin-Kudu'),
-    ('kano_dawakin-tofa','Kano / Dawakin-Tofa'),
-    ('kano_doguwa','Kano / Doguwa'),
-    ('kano_fagge','Kano / Fagge'),
-    ('kano_gabasawa','Kano / Gabasawa'),
-    ('kano_garko','Kano / Garko'),
-    ('kano_garun-mallam','Kano / Garun-Mallam'),
-    ('kano_gaya','Kano / Gaya'),
-    ('kano_gezawa','Kano / Gezawa'),
-    ('kano_gwale','Kano / Gwale'),
-    ('kano_gwarzo','Kano / Gwarzo'),
-    ('kano_kano-municipal','Kano / Kano-Municipal'),
-    ('kano_karaye','Kano / Karaye'),
-    ('kano_kibiya','Kano / Kibiya'),
-    ('kano_kiru','Kano / Kiru'),
-    ('kano_kumbotso','Kano / Kumbotso'),
-    ('kano_kunchi','Kano / Kunchi'),
-    ('kano_kura','Kano / Kura'),
-    ('kano_madobi','Kano / Madobi'),
-    ('kano_makoda','Kano / Makoda'),
-    ('kano_minjibir','Kano / Minjibir'),
-    ('kano_nasarawa','Kano / Nasarawa'),
-    ('kano_rano','Kano / Rano'),
-    ('kano_rimin-gado','Kano / Rimin-Gado'),
-    ('kano_rogo','Kano / Rogo'),
-    ('kano_shanono','Kano / Shanono'),
-    ('kano_sumaila','Kano / Sumaila'),
-    ('kano_takai','Kano / Takai'),
-    ('kano_tarauni','Kano / Tarauni'),
-    ('kano_tofa','Kano / Tofa'),
-    ('kano_tsanyawa','Kano / Tsanyawa'),
-    ('kano_tudun-wada','Kano / Tudun-Wada'),
-    ('kano_ungogo','Kano / Ungogo'),
-    ('kano_warawa','Kano / Warawa'),
-    ('kano_wudil','Kano / Wudil'),
-    ('katsina_bakori','Katsina / Bakori'),
-    ('katsina_batagarawa','Katsina / Batagarawa'),
-    ('katsina_batsari','Katsina / Batsari'),
-    ('katsina_baure','Katsina / Baure'),
-    ('katsina_bindawa','Katsina / Bindawa'),
-    ('katsina_charanchi','Katsina / Charanchi'),
-    ('katsina_dan-musa','Katsina / Dan-Musa'),
-    ('katsina_dandume','Katsina / Dandume'),
-    ('katsina_danji','Katsina / Danji'),
-    ('katsina_daura','Katsina / Daura'),
-    ('katsina_dutsi','Katsina / Dutsi'),
-    ('katsina_dutsinma','Katsina / Dutsinma'),
-    ('katsina_faskari','Katsina / Faskari'),
-    ('katsina_funtua','Katsina / Funtua'),
-    ('katsina_ingawa','Katsina / Ingawa'),
-    ('katsina_jibia','Katsina / Jibia'),
-    ('katsina_kafur','Katsina / Kafur'),
-    ('katsina_kaita','Katsina / Kaita'),
-    ('katsina_kankara','Katsina / Kankara'),
-    ('katsina_kankia','Katsina / Kankia'),
-    ('katsina_katsina','Katsina / Katsina'),
-    ('katsina_kurfi','Katsina / Kurfi'),
-    ('katsina_kusada','Katsina / Kusada'),
-    ('katsina_mai-adua','Katsina / Mai-Adua'),
-    ('katsina_malumfashi','Katsina / Malumfashi'),
-    ('katsina_mani','Katsina / Mani'),
-    ('katsina_mashi','Katsina / Mashi'),
-    ('katsina_matazu','Katsina / Matazu'),
-    ('katsina_musawa','Katsina / Musawa'),
-    ('katsina_rimi','Katsina / Rimi'),
-    ('katsina_sabuwa','Katsina / Sabuwa'),
-    ('katsina_safana','Katsina / Safana'),
-    ('katsina_sandamu','Katsina / Sandamu'),
-    ('katsina_zango','Katsina / Zango'),
-    ('kebbi_aleiro','Kebbi / Aleiro'),
-    ('kebbi_arewa-dandi','Kebbi / Arewa-Dandi'),
-    ('kebbi_argungu','Kebbi / Argungu'),
-    ('kebbi_augie','Kebbi / Augie'),
-    ('kebbi_bagudo','Kebbi / Bagudo'),
-    ('kebbi_birnin-kebbi','Kebbi / Birnin-Kebbi'),
-    ('kebbi_bumza','Kebbi / Bumza'),
-    ('kebbi_dandi','Kebbi / Dandi'),
-    ('kebbi_danko','Kebbi / Danko'),
-    ('kebbi_fakai','Kebbi / Fakai'),
-    ('kebbi_gwandu','Kebbi / Gwandu'),
-    ('kebbi_jega','Kebbi / Jega'),
-    ('kebbi_kalgo','Kebbi / Kalgo'),
-    ('kebbi_koko-besse','Kebbi / Koko-Besse'),
-    ('kebbi_maiyama','Kebbi / Maiyama'),
-    ('kebbi_ngaski','Kebbi / Ngaski'),
-    ('kebbi_sakaba','Kebbi / Sakaba'),
-    ('kebbi_shanga','Kebbi / Shanga'),
-    ('kebbi_suru','Kebbi / Suru'),
-    ('kebbi_wasagu','Kebbi / Wasagu'),
-    ('kebbi_yauri','Kebbi / Yauri'),
-    ('kebbi_zuru','Kebbi / Zuru'),
-    ('kogi_adavi','Kogi / Adavi'),
-    ('kogi_ajaokuta','Kogi / Ajaokuta'),
-    ('kogi_ankpa','Kogi / Ankpa'),
-    ('kogi_bassa','Kogi / Bassa'),
-    ('kogi_dekina','Kogi / Dekina'),
-    ('kogi_ibaji','Kogi / Ibaji'),
-    ('kogi_idah','Kogi / Idah'),
-    ('kogi_igalamela','Kogi / Igalamela'),
-    ('kogi_ijumu','Kogi / Ijumu'),
-    ('kogi_ikoyi-ijumu','Kogi / Ikoyi-Ijumu'),
-    ('kogi_kabba/bunu','Kogi / Kabba/Bunu'),
-    ('kogi_kogi','Kogi / Kogi'),
-    ('kogi_lokoja','Kogi / Lokoja'),
-    ('kogi_mopa-muro','Kogi / Mopa-Muro'),
-    ('kogi_obaji','Kogi / Obaji'),
-    ('kogi_ofu','Kogi / Ofu'),
-    ('kogi_ogori/magongo','Kogi / Ogori/Magongo'),
-    ('kogi_okehi','Kogi / Okehi'),
-    ('kogi_okene','Kogi / Okene'),
-    ('kogi_olamaboro','Kogi / Olamaboro'),
-    ('kogi_omala','Kogi / Omala'),
-    ('kogi_oru','Kogi / Oru'),
-    ('kogi_oyi','Kogi / Oyi'),
-    ('kogi_yagba-east','Kogi / Yagba-East'),
-    ('kogi_yagba-west','Kogi / Yagba-West'),
-    ('kwara_asa','Kwara / Asa'),
-    ('kwara_baruten','Kwara / Baruten'),
-    ('kwara_edu','Kwara / Edu'),
-    ('kwara_ekiti','Kwara / Ekiti'),
-    ('kwara_ilorin-east','Kwara / Ilorin-East'),
-    ('kwara_ilorin-south','Kwara / Ilorin-South'),
-    ('kwara_ilorin-west','Kwara / Ilorin-West'),
-    ('kwara_isin','Kwara / Isin'),
-    ('kwara_kaiama','Kwara / Kaiama'),
-    ('kwara_moro','Kwara / Moro'),
-    ('kwara_offa','Kwara / Offa'),
-    ('kwara_oke-ero','Kwara / Oke-Ero'),
-    ('kwara_oyun','Kwara / Oyun'),
-    ('kwara_pategi','Kwara / Pategi'),
-    ('kwara_ifelodun','Kwara / Ifelodun'),
-    ('kwara_irepodun','Kwara / Irepodun'),
-    ('lagos_agege','Lagos / Agege'),
-    ('lagos_ajeromi-ifelodun','Lagos / Ajeromi-Ifelodun'),
-    ('lagos_alimosho','Lagos / Alimosho'),
-    ('lagos_amuwo-odofin','Lagos / Amuwo-Odofin'),
-    ('lagos_apapa','Lagos / Apapa'),
-    ('lagos_badagry','Lagos / Badagry'),
-    ('lagos_epe','Lagos / Epe'),
-    ('lagos_eti-osa','Lagos / Eti-Osa'),
-    ('lagos_ibeju-lekki','Lagos / Ibeju-Lekki'),
-    ('lagos_ifako-ijaiye','Lagos / Ifako-Ijaiye'),
-    ('lagos_ikeja','Lagos / Ikeja'),
-    ('lagos_ikorodu','Lagos / Ikorodu'),
-    ('lagos_island','Lagos / Island'),
-    ('lagos_kosofe','Lagos / Kosofe'),
-    ('lagos_lagos-island','Lagos / Lagos-Island'),
-    ('lagos_lagos-mainland','Lagos / Lagos-Mainland'),
-    ('lagos_mushin','Lagos / Mushin'),
-    ('lagos_ojo','Lagos / Ojo'),
-    ('lagos_oshodi-isolo','Lagos / Oshodi-Isolo'),
-    ('lagos_shomolu','Lagos / Shomolu'),
-    ('lagos_somolu','Lagos / Somolu'),
-    ('lagos_suru-lere','Lagos / Suru-Lere'),
-    ('nassarawa_akwanga','Nassarawa / Akwanga'),
-    ('nassarawa_awe','Nassarawa / Awe'),
-    ('nassarawa_doma','Nassarawa / Doma'),
-    ('nassarawa_karu','Nassarawa / Karu'),
-    ('nassarawa_keana','Nassarawa / Keana'),
-    ('nassarawa_keffi','Nassarawa / Keffi'),
-    ('nassarawa_kokona','Nassarawa / Kokona'),
-    ('nassarawa_lafia','Nassarawa / Lafia'),
-    ('nassarawa_nassawara','Nassarawa / Nassawara'),
-    ('nassarawa_nassarawa','Nassarawa / Nassarawa'),
-    ('nassarawa_nassawara_eggon','Nassarawa / Nassawara Eggon'),
-    ('nassarawa_obi','Nassarawa / Obi'),
-    ('nassarawa_toto','Nassarawa / Toto'),
-    ('nassarawa_wambu','Nassarawa / Wambu'),
-    ('niger_agaie','Niger / Agaie'),
-    ('niger_agwara','Niger / Agwara'),
-    ('niger_bida','Niger / Bida'),
-    ('niger_borgu','Niger / Borgu'),
-    ('niger_bosso','Niger / Bosso'),
-    ('niger_chanchaga','Niger / Chanchaga'),
-    ('niger_edati','Niger / Edati'),
-    ('niger_gbako','Niger / Gbako'),
-    ('niger_gurara','Niger / Gurara'),
-    ('niger_katcha','Niger / Katcha'),
-    ('niger_kontagora','Niger / Kontagora'),
-    ('niger_lapai','Niger / Lapai'),
-    ('niger_lavun','Niger / Lavun'),
-    ('niger_magama','Niger / Magama'),
-    ('niger_mariga','Niger / Mariga'),
-    ('niger_mashegu','Niger / Mashegu'),
-    ('niger_mokwa','Niger / Mokwa'),
-    ('niger_muya','Niger / Muya'),
-    ('niger_paikoro','Niger / Paikoro'),
-    ('niger_rafi','Niger / Rafi'),
-    ('niger_rijau','Niger / Rijau'),
-    ('niger_shiroro','Niger / Shiroro'),
-    ('niger_suleja','Niger / Suleja'),
-    ('niger_tafa','Niger / Tafa'),
-    ('niger_wushishi','Niger / Wushishi'),
-    ('ogun_abeokuta-north','Ogun / Abeokuta-North'),
-    ('ogun_abeokuta-south','Ogun / Abeokuta-South'),
-    ('ogun_ado-odo/ota','Ogun / Ado-Odo/Ota'),
-    ('ogun_adoodo-ota','Ogun / Adoodo-Ota'),
-    ('ogun_ewekoro','Ogun / Ewekoro'),
-    ('ogun_idarapo','Ogun / Idarapo'),
-    ('ogun_iffo-otta','Ogun / Iffo-Otta'),
-    ('ogun_ifo','Ogun / Ifo'),
-    ('ogun_igbado-north','Ogun / Igbado-North'),
-    ('ogun_igbado-south','Ogun / Igbado-South'),
-    ('ogun_ijebu-east','Ogun / Ijebu-East'),
-    ('ogun_ijebu-north','Ogun / Ijebu-North'),
-    ('ogun_ijebu-north-east','Ogun / Ijebu-North-East'),
-    ('ogun_ijebu-ode','Ogun / Ijebu-Ode'),
-    ('ogun_ikenne','Ogun / Ikenne'),
-    ('ogun_ilishan_remo','Ogun / Ilishan Remo'),
-    ('ogun_ilugun-alaro','Ogun / Ilugun-Alaro'),
-    ('ogun_imeko-afon','Ogun / Imeko-Afon'),
-    ('ogun_ipokia','Ogun / Ipokia'),
-    ('ogun_lgayekpe_','Ogun / Lgayekpe'),
-    ('ogun_obafemi-owode','Ogun / Obafemi-Owode'),
-    ('ogun_odedah','Ogun / Odedah'),
-    ('ogun_odogbolu','Ogun / Odogbolu'),
-    ('ogun_ogun-waterside','Ogun / Ogun-Waterside'),
-    ('ogun_remo-north','Ogun / Remo-North'),
-    ('ogun_sagamu','Ogun / Sagamu'),
-    ('ogun_shagamu','Ogun / Shagamu'),
-    ('ogun_yewa','Ogun / Yewa'),
-    ('ondo_akoko','Ondo / Akoko'),
-    ('ondo_akoko-north','Ondo / Akoko-North'),
-    ('ondo_akoko-north-east','Ondo / Akoko-North-East'),
-    ('ondo_akoko-north-west','Ondo / Akoko-North-West'),
-    ('ondo_akoko-south','Ondo / Akoko-South'),
-    ('ondo_akoko-south-east','Ondo / Akoko-South-East'),
-    ('ondo_akoko-south-west','Ondo / Akoko-South-West'),
-    ('ondo_akure','Ondo / Akure'),
-    ('ondo_akure-north','Ondo / Akure-North'),
-    ('ondo_akure-south','Ondo / Akure-South'),
-    ('ondo_ese-odo','Ondo / Ese-Odo'),
-    ('ondo_idanre','Ondo / Idanre'),
-    ('ondo_ifedore','Ondo / Ifedore'),
-    ('ondo_ikale','Ondo / Ikale'),
-    ('ondo_ilaje','Ondo / Ilaje'),
-    ('ondo_ilaje-west','Ondo / Ilaje-West'),
-    ('ondo_ile-oluji-okeigbo','Ondo / Ile-Oluji-Okeigbo'),
-    ('ondo_irele','Ondo / Irele'),
-    ('ondo_odigbo','Ondo / Odigbo'),
-    ('ondo_okiti-pupa','Ondo / Okiti-Pupa'),
-    ('ondo_ondo','Ondo / Ondo'),
-    ('ondo_ondo-east','Ondo / Ondo-East'),
-    ('ondo_ondo-west','Ondo / Ondo-West'),
-    ('ondo_ose','Ondo / Ose'),
-    ('ondo_owo','Ondo / Owo'),
-    ('osun_atakumosa','Osun / Atakumosa'),
-    ('osun_atakumosa_east','Osun / Atakumosa East'),
-    ('osun_ayeda-ade','Osun / Ayeda-Ade'),
-    ('osun_ayedire','Osun / Ayedire'),
-    ('osun_boluwaduro','Osun / Boluwaduro'),
-    ('osun_boripe','Osun / Boripe'),
-    ('osun_ede','Osun / Ede'),
-    ('osun_ede-north','Osun / Ede North'),
-    ('osun_egbedore','Osun / Egbedore'),
-    ('osun_ejigbo','Osun / Ejigbo'),
-    ('osun_ife','Osun / Ife'),
-    ('osun_ife-north','Osun / Ife-North'),
-    ('osun_ife-south','Osun / Ife-South'),
-    ('osun_ife-central','Osun / Ife-Central'),
-    ('osun_ife-east','Osun / Ife-East'),
-    ('osun_ifelodun','Osun / Ifelodun'),
-    ('osun_ila','Osun / Ila'),
-    ('osun_ilesa-east','Osun / Ilesa-East'),
-    ('osun_ilesa-west','Osun / Ilesa-West'),
-    ('osun_ilesha','Osun / Ilesha'),
-    ('osun_ilesha_west','Osun / Ilesha West'),
-    ('osun_irepodun','Osun / Irepodun'),
-    ('osun_irewole','Osun / Irewole'),
-    ('osun_isokan','Osun / Isokan'),
-    ('osun_iwo','Osun / Iwo'),
-    ('osun_obokun','Osun / Obokun'),
-    ('osun_odo-otin','Osun / Odo-Otin'),
-    ('osun_ola_oluwa','Osun / Ola Oluwa'),
-    ('osun_olorunda','Osun / Olorunda'),
-    ('osun_ori-ade','Osun / Ori-Ade'),
-    ('osun_orolu','Osun / Orolu'),
-    ('osun_osogbo','Osun / Osogbo'),
-    ('oyo_afijio','Oyo / Afijio'),
-    ('oyo_akinyele','Oyo / Akinyele'),
-    ('oyo_atiba','Oyo / Atiba'),
-    ('oyo_atigbo','Oyo / Atigbo'),
-    ('oyo_egbeda','Oyo / Egbeda'),
-    ('oyo_ibadan-central','Oyo / Ibadan-Central'),
-    ('oyo_ibadan-north-east','Oyo / Ibadan-North-East'),
-    ('oyo_ibadan-north-west','Oyo / Ibadan-North-West'),
-    ('oyo_ibadan-south-east','Oyo / Ibadan-South-East'),
-    ('oyo_ibadan-south-west','Oyo / Ibadan-South-West'),
-    ('oyo_ibarapa-central','Oyo / Ibarapa-Central'),
-    ('oyo_ibarapa-east','Oyo / Ibarapa-East'),
-    ('oyo_ibarapa-north','Oyo / Ibarapa-North'),
-    ('oyo_ido','Oyo / Ido'),
-    ('oyo_ifedayo','Oyo / Ifedayo'),
-    ('oyo_ifeloju','Oyo / Ifeloju'),
-    ('oyo_irepo','Oyo / Irepo'),
-    ('oyo_iseyin','Oyo / Iseyin'),
-    ('oyo_itseiwaju','Oyo / Itseiwaju'),
-    ('oyo_iwajowa','Oyo / Iwajowa'),
-    ('oyo_kajola','Oyo / Kajola'),
-    ('oyo_lagelu','Oyo / Lagelu'),
-    ('oyo_odo-oluwa','Oyo / Odo-Oluwa'),
-    ('oyo_ogbomosho-north','Oyo / Ogbomosho-North'),
-    ('oyo_ogbomosho-south','Oyo / Ogbomosho-South'),
-    ('oyo_olorunsogo','Oyo / Olorunsogo'),
-    ('oyo_oluyole','Oyo / Oluyole'),
-    ('oyo_ona-ara','Oyo / Ona-Ara'),
-    ('oyo_orelope','Oyo / Orelope'),
-    ('oyo_ori-ire','Oyo / Ori-Ire'),
-    ('oyo_oyo-west','Oyo / Oyo-West'),
-    ('oyo_saki-east','Oyo / Saki-East'),
-    ('oyo_saki-west','Oyo / Saki-West'),
-    ('oyo_surulere','Oyo / Surulere'),
-    ('plateau_barkin-ladi','Plateau / Barkin-Ladi'),
-    ('plateau_bassa','Plateau / Bassa'),
-    ('plateau_bokkos','Plateau / Bokkos'),
-    ('plateau_jos-east','Plateau / Jos-East'),
-    ('plateau_jos-north','Plateau / Jos-North'),
-    ('plateau_jos-south','Plateau / Jos-South'),
-    ('plateau_kanam','Plateau / Kanam'),
-    ('plateau_kanke','Plateau / Kanke'),
-    ('plateau_langtang-north','Plateau / Langtang-North'),
-    ('plateau_langtang-south','Plateau / Langtang-South'),
-    ('plateau_mangu','Plateau / Mangu'),
-    ('plateau_mikang','Plateau / Mikang'),
-    ('plateau_pankshin','Plateau / Pankshin'),
-    ('plateau_quananpan','Plateau / Quananpan'),
-    ('plateau_riyom','Plateau / Riyom'),
-    ('plateau_shendam','Plateau / Shendam'),
-    ('plateau_wase','Plateau / Wase'),
-    ('rivers_aboa/odual','Rivers / Aboa/Odual'),
-    ('rivers_ahoada-east','Rivers / Ahoada-East'),
-    ('rivers_ahoada-west','Rivers / Ahoada-West'),
-    ('rivers_akukutoru','Rivers / Akukutoru'),
-    ('rivers_andoni','Rivers / Andoni'),
-    ('rivers_asari-toru','Rivers / Asari-Toru'),
-    ('rivers_bonny','Rivers / Bonny'),
-    ('rivers_buguma','Rivers / Buguma'),
-    ('rivers_degema','Rivers / Degema'),
-    ('rivers_eleme','Rivers / Eleme'),
-    ('rivers_elfane','Rivers / Elfane'),
-    ('rivers_emuoha','Rivers / Emuoha'),
-    ('rivers_etche','Rivers / Etche'),
-    ('rivers_gokana','Rivers / Gokana'),
-    ('rivers_ikwerre','Rivers / Ikwerre'),
-    ('rivers_khana','Rivers / Khana'),
-    ('rivers_obia/akpor','Rivers / Obia/Akpor'),
-    ('rivers_ogba-egbema-ndoni','Rivers / Ogba-Egbema-Ndoni'),
-    ('rivers_ogba/egbema/ndoni','Rivers / Ogba/Egbema/Ndoni'),
-    ('rivers_ogu/bolo','Rivers / Ogu/Bolo'),
-    ('rivers_okirika','Rivers / Okirika'),
-    ('rivers_omuma','Rivers / Omuma'),
-    ('rivers_opobo/nkoro','Rivers / Opobo/Nkoro'),
-    ('rivers_oyigbo','Rivers / Oyigbo'),
-    ('rivers_port-harcourt','Rivers / Port-Harcourt'),
-    ('rivers_tai','Rivers / Tai'),
-    ('sokoto_binji','Sokoto / Binji'),
-    ('sokoto_bodinga','Sokoto / Bodinga'),
-    ('sokoto_dange-shuni','Sokoto / Dange-Shuni'),
-    ('sokoto_gada','Sokoto / Gada'),
-    ('sokoto_goronyo','Sokoto / Goronyo'),
-    ('sokoto_gudu','Sokoto / Gudu'),
-    ('sokoto_gwadabawa','Sokoto / Gwadabawa'),
-    ('sokoto_illela','Sokoto / Illela'),
-    ('sokoto_kebbe','Sokoto / Kebbe'),
-    ('sokoto_kware','Sokoto / Kware'),
-    ('sokoto_raba','Sokoto / Raba'),
-    ('sokoto_sabo-birni','Sokoto / Sabo-Birni'),
-    ('sokoto_shagari','Sokoto / Shagari'),
-    ('sokoto_silame','Sokoto / Silame'),
-    ('sokoto_sokoto-north','Sokoto / Sokoto-North'),
-    ('sokoto_sokoto-south','Sokoto / Sokoto-South'),
-    ('sokoto_tambuwal','Sokoto / Tambuwal'),
-    ('sokoto_tangaza','Sokoto / Tangaza'),
-    ('sokoto_tureta','Sokoto / Tureta'),
-    ('sokoto_wamakko','Sokoto / Wamakko'),
-    ('sokoto_wurno','Sokoto / Wurno'),
-    ('sokoto_yabo','Sokoto / Yabo'),
-    ('taraba_ardo-kola','Taraba / Ardo-Kola'),
-    ('taraba_bali','Taraba / Bali'),
-    ('taraba_donga','Taraba / Donga'),
-    ('taraba_gashaka','Taraba / Gashaka'),
-    ('taraba_gassol','Taraba / Gassol'),
-    ('taraba_ibi','Taraba / Ibi'),
-    ('taraba_jalingo','Taraba / Jalingo'),
-    ('taraba_karim-lamido','Taraba / Karim-Lamido'),
-    ('taraba_kurmi','Taraba / Kurmi'),
-    ('taraba_lau','Taraba / Lau'),
-    ('taraba_oilingo','Taraba / Oilingo'),
-    ('taraba_sardauna','Taraba / Sardauna'),
-    ('taraba_takum','Taraba / Takum'),
-    ('taraba_ussa','Taraba / Ussa'),
-    ('taraba_wukari','Taraba / Wukari'),
-    ('taraba_yorro','Taraba / Yorro'),
-    ('taraba_zing','Taraba / Zing'),
-    ('yobe_bade','Yobe / Bade'),
-    ('yobe_borsali','Yobe / Borsali'),
-    ('yobe_damaturu','Yobe / Damaturu'),
-    ('yobe_fika','Yobe / Fika'),
-    ('yobe_fune','Yobe / Fune'),
-    ('yobe_geidam','Yobe / Geidam'),
-    ('yobe_gogaram','Yobe / Gogaram'),
-    ('yobe_gujba','Yobe / Gujba'),
-    ('yobe_gulani','Yobe / Gulani'),
-    ('yobe_jakusko','Yobe / Jakusko'),
-    ('yobe_karasuwa','Yobe / Karasuwa'),
-    ('yobe_machina','Yobe / Machina'),
-    ('yobe_nangere','Yobe / Nangere'),
-    ('yobe_nguru','Yobe / Nguru'),
-    ('yobe_potiskum','Yobe / Potiskum'),
-    ('yobe_tarmua','Yobe / Tarmua'),
-    ('yobe_yunusari','Yobe / Yunusari'),
-    ('yobe_yusufari','Yobe / Yusufari'),
-    ('zamfara_anka','Zamfara / Anka'),
-    ('zamfara_bakura','Zamfara / Bakura'),
-    ('zamfara_bukkuyum','Zamfara / Bukkuyum'),
-    ('zamfara_bungudu','Zamfara / Bungudu'),
-    ('zamfara_gumi','Zamfara / Gumi'),
-    ('zamfara_gusau','Zamfara / Gusau'),
-    ('zamfara_isa','Zamfara / Isa'),
-    ('zamfara_kaura-namoda','Zamfara / Kaura-Namoda'),
-    ('zamfara_kiyawa','Zamfara / Kiyawa'),
-    ('zamfara_maradun','Zamfara / Maradun'),
-    ('zamfara_maru','Zamfara / Maru'),
-    ('zamfara_shinkafi','Zamfara / Shinkafi'),
-    ('zamfara_talata-mafara','Zamfara / Talata-Mafara'),
-    ('zamfara_tsafe','Zamfara / Tsafe'),
-    ('zamfara_zurmi','Zamfara / Zurmi'),
-    ('osun_aiyedire','Osun / Aiyedire'),
-    ('cross_river_biase','Cross River / Biase'),
-    ('ogun_egbado-north','Ogun / Egbado-North'),
-    ('ogun_egbado-south','Ogun / Egbado-South'),
-    ('oyo_itesiwaju','Oyo / Itesiwaju'),
-    ('oyo_ogo-oluwa','Oyo / Ogo-Oluwa'),
-    ('ebonyi_ohaukwu','Ebonyi / Ohaukwu'),
-    ('ondo_okitipupa','Ondo / Okitipupa'),
-    ('osun_oriade','Osun / Oriade'),
-    ('benue_oturkpo','Benue / Oturkpo'),
-    ('oyo_oyo-east','Oyo / Oyo-East'),
-    ('abia_ukwa-east','Abia / Ukwa-East'),
-    ('akwa_ibom_urue-ffong-oruko','Akwa Ibom / Urue-Offong-Oruko'),
-    ('foreigner','Foreigner')
-    )
Index: in/waeup.kofa/trunk/src/waeup/kofa/students/nats.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/nats.py	(revision 8068)
+++ 	(revision )
@@ -1,253 +1,0 @@
-NATS = (
-    ('nigeria','Nigeria'),
-    ('afghanistan','Afghanistan'),
-    ('albania','Albania'),
-    ('algeria','Algeria'),
-    ('american_samoa','American Samoa'),
-    ('andorra','Andorra'),
-    ('angola','Angola'),
-    ('anguilla','Anguilla'),
-    ('antarctica','Antarctica'),
-    ('antigua_and_barbuda','Antigua And Barbuda'),
-    ('argentina','Argentina'),
-    ('armenia','Armenia'),
-    ('aruba','Aruba'),
-    ('ascension_island','Ascension Island'),
-    ('australia','Australia'),
-    ('austria','Austria'),
-    ('azerbaijan','Azerbaijan'),
-    ('bahamas','Bahamas'),
-    ('bahrain','Bahrain'),
-    ('bangladesh','Bangladesh'),
-    ('barbados','Barbados'),
-    ('belarus','Belarus'),
-    ('belgium','Belgium'),
-    ('belize','Belize'),
-    ('benin','Benin'),
-    ('bermuda','Bermuda'),
-    ('bhutan','Bhutan'),
-    ('bolivia','Bolivia'),
-    ('bosnia_and_herzegovina','Bosnia And Herzegovina'),
-    ('botswana','Botswana'),
-    ('bouvet_island','Bouvet Island'),
-    ('brazil','Brazil'),
-    ('british_indian_ocean_territory','British Indian Ocean Territory'),
-    ('british_virgin_islands','British Virgin Islands'),
-    ('brunei_darussalam','Brunei Darussalam'),
-    ('bulgaria','Bulgaria'),
-    ('burkina_faso','Burkina Faso'),
-    ('burma','Burma'),
-    ('burundi','Burundi'),
-    ('cambodia','Cambodia'),
-    ('cameroon','Cameroon'),
-    ('canada','Canada'),
-    ('cape_verde','Cape Verde'),
-    ('cayman_islands','Cayman Islands'),
-    ('central_african_republic','Central African Republic'),
-    ('chad','Chad'),
-    ('chile','Chile'),
-    ('china','China'),
-    ('christmas_island','Christmas Island'),
-    ('cocos_keeling_islands','Cocos (Keeling) Islands'),
-    ('colombia','Colombia'),
-    ('comoros','Comoros'),
-    ('congo_brazzaville_','Congo (Brazzaville) '),
-    ('congo_dem_rep','Congo, Democratic Republic Of'),
-    ('cook_islands','Cook Islands'),
-    ('costa_rica','Costa Rica'),
-    ('cote_d_ivoire',"Cote D'Ivoire"),
-    ('croatia','Croatia'),
-    ('cuba','Cuba'),
-    ('cyprus','Cyprus'),
-    ('czech_republic','Czech Republic'),
-    ('denmark','Denmark'),
-    ('djibouti','Djibouti'),
-    ('dominica','Dominica'),
-    ('dominican_republic','Dominican Republic'),
-    ('east_timor','East Timor'),
-    ('ecuador','Ecuador'),
-    ('egypt','Egypt'),
-    ('el_salvador','El Salvador'),
-    ('england','England'),
-    ('equatorial_guinea','Equatorial Guinea'),
-    ('eritrea','Eritrea'),
-    ('estonia','Estonia'),
-    ('ethiopia','Ethiopia'),
-    ('falkland_islands','Falkland Islands (Islas Malvinas) '),
-    ('faroe_islands','Faroe Islands'),
-    ('fiji','Fiji'),
-    ('finland','Finland'),
-    ('france','France'),
-    ('french_guiana','French Guiana'),
-    ('french_polynesia','French Polynesia'),
-    ('french_southern_territories','French Southern Territories'),
-    ('gabon','Gabon'),
-    ('gambia','Gambia, The'),
-    ('georgia','Georgia'),
-    ('germany','Germany'),
-    ('ghana','Ghana'),
-    ('gibraltar','Gibraltar'),
-    ('greece','Greece'),
-    ('greenland_denmark_','Greenland (Denmark) '),
-    ('grenada','Grenada'),
-    ('guadeloupe','Guadeloupe'),
-    ('guam','Guam'),
-    ('guatemala','Guatemala'),
-    ('guinea','Guinea'),
-    ('guinea-bissau','Guinea-Bissau'),
-    ('guyana','Guyana'),
-    ('haiti','Haiti'),
-    ('heard_and_mcdonald_islands','Heard And McDonald Islands'),
-    ('honduras','Honduras'),
-    ('hong_kong','Hong Kong (Special Admin Region Of China) '),
-    ('hungary','Hungary'),
-    ('iceland','Iceland'),
-    ('india','India'),
-    ('indonesia','Indonesia'),
-    ('iran','Iran'),
-    ('iraq','Iraq'),
-    ('ireland','Ireland'),
-    ('isle_of_man','Isle Of Man'),
-    ('israel','Israel'),
-    ('italy','Italy'),
-    ('jamaica','Jamaica'),
-    ('japan','Japan'),
-    ('johnston_atoll','Johnston Atoll'),
-    ('jordan','Jordan'),
-    ('kazakhstan','Kazakhstan'),
-    ('kenya','Kenya'),
-    ('kiribati','Kiribati'),
-    ('korea_north_','Korea, Democratic People S Republic Of (North) '),
-    ('korea_south_','Korea, Republic Of (South) '),
-    ('kuwait','Kuwait'),
-    ('kyrgyzstan','Kyrgyzstan'),
-    ('laos_','Lao People S Democratic Republic (Laos) '),
-    ('latvia','Latvia'),
-    ('lebanon','Lebanon'),
-    ('lesotho','Lesotho'),
-    ('liberia','Liberia'),
-    ('libya','Libyan Arab Jamahiriya'),
-    ('liechtenstein','Liechtenstein'),
-    ('lithuania','Lithuania'),
-    ('luxembourg','Luxembourg'),
-    ('macau','Macau (Special Admin Region Of China) '),
-    ('macedonia','Macedonia, Former Yugoslav Republic Of'),
-    ('madagascar','Madagascar'),
-    ('malawi','Malawi'),
-    ('malaysia','Malaysia'),
-    ('maldives','Maldives'),
-    ('mali','Mali'),
-    ('malta','Malta'),
-    ('marshall_islands','Marshall Islands'),
-    ('martinique','Martinique'),
-    ('mauritania','Mauritania'),
-    ('mauritius','Mauritius'),
-    ('mayotte','Mayotte'),
-    ('mexico','Mexico'),
-    ('micronesia','Micronesia, Federated States Of'),
-    ('midway_islands','Midway Islands'),
-    ('moldova','Moldova, Republic Of'),
-    ('monaco','Monaco'),
-    ('mongolia','Mongolia'),
-    ('montserrat','Montserrat'),
-    ('morocco','Morocco'),
-    ('mozambique','Mozambique'),
-    ('myanmar','Myanmar'),
-    ('namibia','Namibia'),
-    ('nauru','Nauru'),
-    ('nepal','Nepal'),
-    ('netherlands','Netherlands'),
-    ('netherlands_antilles','Netherlands Antilles'),
-    ('new_caledonia','New Caledonia'),
-    ('new_zealand','New Zealand'),
-    ('nicaragua','Nicaragua'),
-    ('niger','Niger'),
-    ('niue','Niue'),
-    ('norfolk_island','Norfolk Island'),
-    ('northern_mariana_islands','Northern Mariana Islands'),
-    ('norway','Norway'),
-    ('oman','Oman'),
-    ('pakistan','Pakistan'),
-    ('palau','Palau'),
-    ('palestinian_territory','Palestinian Territory, Occupied'),
-    ('panama','Panama'),
-    ('papua_new_guinea','Papua New Guinea'),
-    ('paraguay','Paraguay'),
-    ('peru','Peru'),
-    ('philippines','Philippines'),
-    ('pitcairn_islands','Pitcairn Islands'),
-    ('poland','Poland'),
-    ('portugal','Portugal'),
-    ('puerto_rico','Puerto Rico'),
-    ('qatar','Qatar'),
-    ('reunion','Reunion'),
-    ('romania','Romania'),
-    ('russian_federation','Russian Federation'),
-    ('rwanda','Rwanda'),
-    ('saint_helena_island','Saint Helena Island'),
-    ('saint_kitts_and_nevis','Saint Kitts And Nevis'),
-    ('saint_lucia','Saint Lucia'),
-    ('saint_pierre_and_miquelon','Saint Pierre And Miquelon'),
-    ('saint_vincent_and_the_grenadines','Saint Vincent And The Grenadines'),
-    ('samoa','Samoa'),
-    ('san_marino','San Marino'),
-    ('sao_tome_and_principe','Sao Tome And Principe'),
-    ('saudi_arabia','Saudi Arabia'),
-    ('scotland','Scotland'),
-    ('senegal','Senegal'),
-    ('seychelles','Seychelles'),
-    ('sierra_leone','Sierra Leone'),
-    ('singapore','Singapore'),
-    ('slovakia','Slovakia'),
-    ('slovenia','Slovenia'),
-    ('solomon_islands','Solomon Islands'),
-    ('somalia','Somalia'),
-    ('south_africa','South Africa'),
-    ('south_georgia_south_sandwich_islands','South Georgia And South Sandwich Islands'),
-    ('spain','Spain'),
-    ('sri_lanka','Sri Lanka'),
-    ('sudan','Sudan'),
-    ('suriname','Suriname'),
-    ('svalbard_and_jan_mayen','Svalbard And Jan Mayen'),
-    ('swaziland','Swaziland'),
-    ('sweden','Sweden'),
-    ('switzerland','Switzerland'),
-    ('syrian_arab_republic','Syrian Arab Republic'),
-    ('taiwan','Taiwan'),
-    ('tajikistan','Tajikistan'),
-    ('tanzania','Tanzania, United Republic Of'),
-    ('thailand','Thailand'),
-    ('tibet','Tibet'),
-    ('togo','Togo'),
-    ('tokelau','Tokelau'),
-    ('tonga','Tonga'),
-    ('trinidad_and_tobago','Trinidad And Tobago'),
-    ('tunisia','Tunisia'),
-    ('turkey','Turkey'),
-    ('turkmenistan','Turkmenistan'),
-    ('turks_and_caicos','Turks And Caicos'),
-    ('tuvalu','Tuvalu'),
-    ('uganda','Uganda'),
-    ('ukraine','Ukraine'),
-    ('united_arab_emirates','United Arab Emirates'),
-    ('united_kingdom','United Kingdom'),
-    ('united_states','United States'),
-    ('united_states_minor_outlying_islands','United States Minor Outlying Islands'),
-    ('united_states_virgin_islands','United States Virgin Islands'),
-    ('uruguay','Uruguay'),
-    ('uzbekistan','Uzbekistan'),
-    ('vanuatu','Vanuatu'),
-    ('vatican_city','Vatican City'),
-    ('venezuela','Venezuela'),
-    ('vietnam','Vietnam'),
-    ('wake_island','Wake Island'),
-    ('wales','Wales'),
-    ('wallis_and_futuna','Wallis And Futuna'),
-    ('western_sahara','Western Sahara'),
-    ('western_samoa','Western Samoa'),
-    ('yemen','Yemen'),
-    ('serbia','Serbia'),
-    ('montenegro','Montenegro'),
-    ('zambia','Zambia'),
-    ('zimbabwe','Zimbabwe'),
-    )
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py	(revision 8069)
@@ -27,13 +27,12 @@
 from waeup.kofa.interfaces import SimpleKofaVocabulary
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.students.lgas import LGAS
-from waeup.kofa.students.nats import NATS
+from waeup.kofa.utils.helpers import get_sorted_preferred
+from waeup.kofa.utils.countries import COUNTRIES
 from waeup.kofa.university.vocabularies import course_levels
 
-lgas_vocab = SimpleKofaVocabulary(
-    *sorted([(x[1],x[0]) for x in LGAS]))
 
-nats_vocab = SimpleKofaVocabulary(
-    *sorted([(x[1],x[0]) for x in NATS]))
+#: a tuple of tuples (<COUNTRY-NAME>, <ISO-CODE>) with Nigeria first.
+COUNTRIES = get_sorted_preferred(COUNTRIES, ['NG'])
+nats_vocab = SimpleKofaVocabulary(*COUNTRIES)
 
 def study_levels(studycourse):
Index: /main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py	(revision 8068)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py	(revision 8069)
@@ -140,7 +140,4 @@
         9: 'N/A'
         }
-
-    #: a tuple of tuples (<COUNTRY-NAME>, <ISO-CODE>) with Nigeria first.
-    COUNTRIES = get_sorted_preferred(COUNTRIES, ['NG'])
 
     def sendContactForm(self,from_name,from_addr,rcpt_name,rcpt_addr,
