Index: /main/waeup.futminna/trunk/src/waeup/futminna/applicants/applicant.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/applicants/applicant.py	(revision 10145)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/applicants/applicant.py	(revision 10146)
@@ -19,4 +19,6 @@
 import grok
 from zope.interface import implementedBy
+from zope.component import getUtility
+from waeup.kofa.interfaces import IExtFileStore
 from waeup.kofa.applicants.applicant import ApplicantFactory
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -24,4 +26,13 @@
 from waeup.futminna.applicants.interfaces import(
     ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit, IPUTMEApplicantEdit)
+
+@grok.subscribe(ICustomApplicant, grok.IObjectRemovedEvent)
+def custom_handle_applicant_removed(applicant, event):
+    """If an applicant is removed also pdf files of this applicant are removed.
+    """
+    file_store = getUtility(IExtFileStore)
+    file_store.deleteFileByContext(applicant, attr='extraform.pdf')
+    file_store.deleteFileByContext(applicant, attr='refereeform.pdf')
+    return
 
 class CustomApplicant(NigeriaApplicant):
Index: /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py
===================================================================
--- /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py	(revision 10145)
+++ /main/waeup.futminna/trunk/src/waeup/futminna/applicants/tests/test_browser.py	(revision 10146)
@@ -151,4 +151,8 @@
             % (self.applicant.applicant_id)
             in logcontent)
+        # When an applicant is removed, also the pdf files are gone.
+        del self.app['applicants']['app2011'][self.applicant.application_number]
+        fd = storage.getFile(file_id)
+        self.assertTrue(fd is None)
 
     def test_upload_refereeform_by_student(self):
@@ -238,2 +242,6 @@
             % (self.applicant.applicant_id)
             in logcontent)
+        # When an applicant is removed, also the pdf files are gone.
+        del self.app['applicants']['app2011'][self.applicant.application_number]
+        fd = storage.getFile(file_id)
+        self.assertTrue(fd is None)
