Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py	(revision 6232)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/certificatecontainer.py	(revision 6233)
@@ -39,7 +39,13 @@
 
     def clear(self):
-        keys = self.keys()
-        for key in keys:
-            del self[key]
+        """Remove all contents from the certificate container.
+        """
+        # This internal function is implemented in C and thus much
+        # faster as we could do it in pure Python.
+        self._SampleContainer__data.clear()
+        # The length attribute is 'lazy'. See `zope.container` for details.
+        # This way we make sure, the next time len() is called, it returns
+        # the real value and not a cached one.
+        del self.__dict__['_BTreeContainer__len']
 
 class CertificateContainerFactory(grok.GlobalUtility):
