diff --git a/dta.zip b/dta.zip
index 7c88e2d7febc39a669f403f20aea99329a5bfdb5..43b83434b380d396d4d0f2618c44def903e4a25e 100644
Binary files a/dta.zip and b/dta.zip differ
diff --git a/dta/classes/privacy/provider.php b/dta/classes/privacy/provider.php
index 829c8f46304271482cdd1eb9938187c8fc92c60d..b56a5390f9895c1db06577b4061c6dfd21e2b8d6 100644
--- a/dta/classes/privacy/provider.php
+++ b/dta/classes/privacy/provider.php
@@ -151,11 +151,6 @@ class provider implements \core_privacy\local\metadata\provider,
         $assign = $exportdata->get_assign();
         $plugin = $assign->get_plugin_by_type('assignsubmission', 'file');
         $submission = $exportdata->get_pluginobject();
-        error_log('Submission class type: ' . get_class($submission));
-
-        error_log('class type >>> ');
-        error_log(print_r(get_class($submission), true));
-        // $files = (new self)->get_files($submission, $user);
         $files = $plugin->get_files($exportdata->get_pluginobject(), $user);
         foreach ($files as $file) {
             $userid = $exportdata->get_pluginobject()->userid;
@@ -164,15 +159,6 @@ class provider implements \core_privacy\local\metadata\provider,
             writer::with_context($exportdata->get_context())->export_file($exportdata->get_subcontext(), $file)
             // DTA result.
             ->export_related_data($dtaresultsummary);
-
-            // Plagiarism data.
-            $coursecontext = $context->get_course_context();
-            \core_plagiarism\privacy\provider::export_plagiarism_user_data($userid, $context, $exportdata->get_subcontext(), [
-                'cmid' => $context->instanceid,
-                'course' => $coursecontext->instanceid,
-                'userid' => $userid,
-                'file' => $file,
-            ]);
         }
     }
 
@@ -184,16 +170,11 @@ class provider implements \core_privacy\local\metadata\provider,
     public static function delete_submission_for_context(assign_plugin_request_data $requestdata) {
         global $DB;
 
-        // \core_plagiarism\privacy\provider::delete_plagiarism_for_context($requestdata->get_context());
-
         $fs = get_file_storage();
         $fs->delete_area_files($requestdata->get_context()->id, 'assignsubmission_dta', \assignsubmission_dta\privacy\provider::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION);
 
         $assignmentid = $requestdata->get_assign()->get_instance()->id;
 
-
-        error_log('ASSIGNMENTID DEL for context >>> ');
-        error_log(print_r($assignmentid, true));
         // Delete records from assignsubmission_dta tables.
         $DB->delete_records('assignsubmission_dta_result', ['assignment_id' => $assignmentid]);
         $DB->delete_records('assignsubmission_dta_summary', ['assignment_id' => $assignmentid]);
@@ -208,25 +189,13 @@ class provider implements \core_privacy\local\metadata\provider,
     public static function delete_submission_for_userid(assign_plugin_request_data $deletedata) {
         global $DB;
 
-        // \core_plagiarism\privacy\provider::delete_plagiarism_for_user($deletedata->get_user()->id, $deletedata->get_context());
-
         $assignmentid = $deletedata->get_assign()->get_instance()->id;
         $submissionid = $deletedata->get_pluginobject()->id;
 
         $fs = get_file_storage();
-        // $fs->delete_area_files($deletedata->get_context()->id, 'assignsubmission_dta', ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
-        //         $submissionid);
-        
         $fs->delete_area_files($deletedata->get_context()->id, 'assignsubmission_dta', \assignsubmission_dta\privacy\provider::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
                 $submissionid);
 
-        
-
-        error_log('SUBMISSIONID DEL for uid >>> ');
-        error_log(print_r($submissionid, true));
-        error_log('ASSIGNMENTID DEL for uid >>> ');
-        error_log(print_r($assignmentid, true));
-
         // Delete records from assignsubmission_dta tables. Also possible with a list as below.
         $DB->delete_records('assignsubmission_dta_result', [
             'assignment_id' => $assignmentid,
@@ -254,8 +223,6 @@ class provider implements \core_privacy\local\metadata\provider,
     public static function delete_submissions(assign_plugin_request_data $deletedata) {
         global $DB;
 
-        // \core_plagiarism\privacy\provider::delete_plagiarism_for_users($deletedata->get_userids(), $deletedata->get_context());
-
         if (empty($deletedata->get_submissionids())) {
             return;
         }
@@ -265,42 +232,8 @@ class provider implements \core_privacy\local\metadata\provider,
                 $sql, $params);
 
         $params['assignid'] = $deletedata->get_assignid();
-        error_log('sql >>> ');
-        error_log(print_r($sql, true));
-        error_log('PARAMS >>> ');
-        error_log(print_r($params, true));
         $DB->delete_records_select('assignsubmission_dta_result', "assignment_id = :assignid AND submissionid $sql", $params);
         $DB->delete_records_select('assignsubmission_dta_summary', "assignment_id = :assignid AND submissionid $sql", $params);
         $DB->delete_records_select('assignsubmission_dta_recommendations', "assignment_id = :assignid AND submissionid $sql", $params);
     }
-
-    /**
-     * Produce a list of files suitable for export that represent this feedback or submission
-     *
-     * @param stdClass $submission The submission
-     * @param stdClass $user The user record - unused
-     * @return array - return an array of files indexed by filename
-     */
-    public function get_files(stdClass $submission, stdClass $user) {
-        $result = [];
-        $fs = get_file_storage();
-
-        $files = $fs->get_area_files($this->assignment->get_context()->id,
-                                     'assignsubmission_file',
-                                     \assignsubmission_dta\privacy\provider::ASSIGNSUBMISSION_DTA_FILEAREA_SUBMISSION,
-                                     $submission->id,
-                                     'timemodified',
-                                     false);
-
-        foreach ($files as $file) {
-            // Do we return the full folder path or just the file name?
-            if (isset($submission->exportfullpath) && $submission->exportfullpath == false) {
-                $result[$file->get_filename()] = $file;
-            } else {
-                $result[$file->get_filepath().$file->get_filename()] = $file;
-            }
-        }
-        return $result;
-    }
-
 }