Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py	(revision 6235)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py	(revision 6236)
@@ -62,22 +62,2 @@
     def getInterfaces(self):
         return implementedBy(CertificateContainer)
-
-@grok.subscribe(ICertificate, grok.IObjectAddedEvent)
-def handle_cert_addition(certificate, event):
-    """XXX: Move me to certificates.py when everything works as expected.
-    """
-    cat = queryUtility(ICatalog, name='certificates_catalog', default=None)
-    if cat is None:
-        return
-    entries = cat.searchResults(
-        code=(certificate.code,certificate.code))
-    if len(entries) == 0:
-        return
-    for entry in entries:
-        if entry is not certificate:
-            # XXX: Evil! We should find a way to block addition _before_
-            #      it actually happens.
-            del certificate.__parent__[certificate.__name__]
-            raise ValueError('Certificate exists already elsewhere: % s' %
-                             (certificate.code, ))
-
