Index: /main/kofacustom.nigeria/trunk/buildout.cfg
===================================================================
--- /main/kofacustom.nigeria/trunk/buildout.cfg	(revision 8890)
+++ /main/kofacustom.nigeria/trunk/buildout.cfg	(revision 8891)
@@ -4,4 +4,5 @@
 # Install waeup.kofa as develop egg
 auto-checkout = waeup.kofa
+sources-dir = sources
 develop = .
 parts =
Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/configure.zcml
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/configure.zcml	(revision 8890)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/configure.zcml	(revision 8891)
@@ -1,10 +1,20 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok"
-           xmlns:i18n="http://namespaces.zope.org/i18n">
+           xmlns:grok="http://namespaces.zope.org/grok">
 
-  <!-- Loading grok also configures a lot of other needed packages correctly.
+  <!-- Loading waeup.kofa also configures a lot of other needed
+       packages correctly.
   -->
+  <include package="waeup.kofa" />
   <include package="kofacustom.nigeria" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="kofacustom.nigeria" file="overrides.zcml" />
+  <grok:grok package="." />
+
+  <!-- Register edit widget for PhoneNumbers -->
+  <adapter
+      for="waeup.kofa.schema.interfaces.IPhoneNumber
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.formlib.interfaces.ISimpleInputWidget"
+      factory="kofacustom.nigeria.widgets.phonewidget.NigeriaPhoneWidget"
+      permission="zope.Public"
+      />
+
 </configure>
Index: in/kofacustom.nigeria/trunk/src/kofacustom/nigeria/overrides.zcml
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/overrides.zcml	(revision 8890)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
-  <includeDependencies package="." />
-  <grok:grok package="." />
-
-  <!-- Register edit widget for PhoneNumbers -->
-  <adapter
-      for="waeup.kofa.schema.interfaces.IPhoneNumber
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.formlib.interfaces.ISimpleInputWidget"
-      factory="kofacustom.nigeria.widgets.phonewidget.NigeriaPhoneWidget"
-      permission="zope.Public"
-      />
-
-</configure>
Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 8890)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 8891)
@@ -66,5 +66,4 @@
     """ Page to display student personal data
     """
-    grok.context(INigeriaStudent)
     form_fields = grok.AutoFields(INigeriaStudentPersonal)
     form_fields['perm_address'].custom_widget = BytesDisplayWidget
@@ -80,5 +79,4 @@
     """ Page to display student clearance data
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -96,5 +94,4 @@
     """Deliver a PDF slip of the context.
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -112,5 +109,4 @@
     """ Page to edit student clearance data
     """
-    grok.context(INigeriaStudent)
 
     @property
@@ -126,5 +122,4 @@
     """ View to edit student clearance data by student
     """
-    grok.context(INigeriaStudent)
 
     @property
