diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 12c6e255e32..8f92902c6e2 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -391,12 +391,11 @@ class assignment_base {
 
         $result = true;
 
-        // now get rid of all attachments
+        // now get rid of all files
         $fs = get_file_storage();
         if ($cm = get_coursemodule_from_instance('assignment', $assignment->id)) {
             $context = get_context_instance(CONTEXT_MODULE, $cm->id);
-            $fs->delete_area_files($context->id, 'assignment_submission');
-            $fs->delete_area_files($context->id, 'assignment_response');
+            $fs->delete_area_files($context->id);
         }
 
         if (! $DB->delete_records('assignment_submissions', array('assignment'=>$assignment->id))) {
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 508a239ac4d..23a61817183 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -179,6 +179,13 @@ function forum_delete_instance($id) {
         return false;
     }
 
+    // now get rid of all files
+    $fs = get_file_storage();
+    if ($cm = get_coursemodule_from_instance('forum', $forum->id)) {
+        $context = get_context_instance(CONTEXT_MODULE, $cm->id);
+        $fs->delete_area_files($context->id);
+    }
+
     $result = true;
 
     if ($discussions = $DB->get_records('forum_discussions', array('forum'=>$forum->id))) {
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index b7d31fe1b06..9695a8713ec 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -172,12 +172,8 @@ function glossary_delete_instance($id) {
     $DB->delete_records_select('glossary_entries_categories', "categoryid IN ($category_select)", array($id));
     $DB->delete_records('glossary_categories', array('glossaryid'=>$id));
 
-    // delete attachments
-    if ($attachments = $DB->get_records('glossary_entries', array('glossaryid'=>$id, 'attachment'=>'1'), '', 'id')) {
-        foreach ($attachments as $entryid=>$unused) {
-            $fs->delete_area_files($context->id, 'glossary_attachment', $entryid);
-        }
-    }
+    // delete all files
+    $fs->delete_area_files($context->id);
 
     glossary_grade_item_delete($glossary);