diff --git a/analytics/classes/manager.php b/analytics/classes/manager.php
index 4e203fcfe80..77f2f2be496 100644
--- a/analytics/classes/manager.php
+++ b/analytics/classes/manager.php
@@ -547,26 +547,14 @@ class manager {
     public static function cleanup() {
         global $DB;
 
-        // Clean up stuff that depends on contexts that do not exist anymore.
-        $sql = "SELECT DISTINCT ap.contextid FROM {analytics_predictions} ap
-                  LEFT JOIN {context} ctx ON ap.contextid = ctx.id
-                 WHERE ctx.id IS NULL";
-        $apcontexts = $DB->get_records_sql($sql);
+        $DB->execute("DELETE FROM {analytics_prediction_actions} WHERE predictionid IN
+                          (SELECT ap.id FROM {analytics_predictions} ap
+                        LEFT JOIN {context} ctx ON ap.contextid = ctx.id
+                            WHERE ctx.id IS NULL)");
 
-        $sql = "SELECT DISTINCT aic.contextid FROM {analytics_indicator_calc} aic
-                  LEFT JOIN {context} ctx ON aic.contextid = ctx.id
-                 WHERE ctx.id IS NULL";
-        $indcalccontexts = $DB->get_records_sql($sql);
-
-        $contexts = $apcontexts + $indcalccontexts;
-        if ($contexts) {
-            list($sql, $params) = $DB->get_in_or_equal(array_keys($contexts));
-            $DB->execute("DELETE FROM {analytics_prediction_actions} WHERE predictionid IN
-                (SELECT ap.id FROM {analytics_predictions} ap WHERE ap.contextid $sql)", $params);
-
-            $DB->delete_records_select('analytics_predictions', "contextid $sql", $params);
-            $DB->delete_records_select('analytics_indicator_calc', "contextid $sql", $params);
-        }
+        $contextsql = "SELECT id FROM {context} ctx";
+        $DB->delete_records_select('analytics_predictions', "contextid NOT IN ($contextsql)");
+        $DB->delete_records_select('analytics_indicator_calc', "contextid NOT IN ($contextsql)");
 
         // Clean up stuff that depends on analysable ids that do not exist anymore.
 
@@ -601,28 +589,19 @@ class manager {
             $param = ['modelid' => $model->get_id()];
 
             if ($predictsamplesanalysableids) {
-                $chunks = array_chunk(array_flip($predictsamplesanalysableids), 1000);
-                foreach ($chunks as $chunk) {
-                    list($idssql, $idsparams) = $DB->get_in_or_equal($chunk, SQL_PARAMS_NAMED);
-                    $DB->delete_records_select('analytics_predict_samples', "modelid = :modelid AND analysableid $idssql",
-                        $param + $idsparams);
-                }
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($predictsamplesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_predict_samples', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
             }
             if ($trainsamplesanalysableids) {
-                $chunks = array_chunk(array_flip($trainsamplesanalysableids), 1000);
-                foreach ($chunks as $chunk) {
-                    list($idssql, $idsparams) = $DB->get_in_or_equal($chunk, SQL_PARAMS_NAMED);
-                    $DB->delete_records_select('analytics_train_samples', "modelid = :modelid AND analysableid $idssql",
-                        $param + $idsparams);
-                }
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($trainsamplesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_train_samples', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
             }
             if ($usedanalysablesanalysableids) {
-                $chunks = array_chunk(array_flip($usedanalysablesanalysableids), 1000);
-                foreach ($chunks as $chunk) {
-                    list($idssql, $idsparams) = $DB->get_in_or_equal($chunk, SQL_PARAMS_NAMED);
-                    $DB->delete_records_select('analytics_used_analysables', "modelid = :modelid AND analysableid $idssql",
-                        $param + $idsparams);
-                }
+                list($idssql, $idsparams) = $DB->get_in_or_equal(array_flip($usedanalysablesanalysableids), SQL_PARAMS_NAMED);
+                $DB->delete_records_select('analytics_used_analysables', "modelid = :modelid AND analysableid $idssql",
+                    $param + $idsparams);
             }
         }
     }
diff --git a/analytics/classes/privacy/provider.php b/analytics/classes/privacy/provider.php
index 36f6069a82a..c147bdfd974 100644
--- a/analytics/classes/privacy/provider.php
+++ b/analytics/classes/privacy/provider.php
@@ -306,13 +306,9 @@ class provider implements
             $idssql = "SELECT ap.id FROM {analytics_predictions} ap
                         WHERE ap.contextid = :contextid AND ap.modelid = :modelid";
             $idsparams = ['contextid' => $context->id, 'modelid' => $modelid];
-            $predictionids = $DB->get_fieldset_sql($idssql, $idsparams);
-            if ($predictionids) {
-                list($predictionidssql, $params) = $DB->get_in_or_equal($predictionids, SQL_PARAMS_NAMED);
 
-                $DB->delete_records_select('analytics_prediction_actions', "predictionid IN ($idssql)", $idsparams);
-                $DB->delete_records_select('analytics_predictions', "id $predictionidssql", $params);
-            }
+            $DB->delete_records_select('analytics_prediction_actions', "predictionid IN ($idssql)", $idsparams);
+            $DB->delete_records_select('analytics_predictions', "contextid = :contextid AND modelid = :modelid", $idsparams);
         }
 
         // We delete them all this table is just a cache and we don't know which model filled it.