diff --git a/include/cleanup.php b/include/cleanup.php
index 3add60c6..af55e8af 100644
--- a/include/cleanup.php
+++ b/include/cleanup.php
@@ -197,7 +197,7 @@ function ban_user_with_leech_warning_expired()
 
 function delete_user(\Illuminate\Database\Eloquent\Builder $query, $reasonKey)
 {
-    $results = $query->get(['id', 'username', 'modcomment']);
+    $results = $query->where('enabled', \App\Models\User::ENABLED_YES)->get(['id', 'username', 'modcomment', 'language']);
     if ($results->isEmpty()) {
         return [];
     }
@@ -213,13 +213,8 @@ function delete_user(\Illuminate\Database\Eloquent\Builder $query, $reasonKey)
             'reason' => nexus_trans($reasonKey, [], $user->locale),
         ];
     }
-//    $update = [
-//        'enabled' => \App\Models\User::ENABLED_NO,
-//        'modcomment' => DB::raw("concat_ws('\n', '[CLEANUP] $reasonKey', modcomment)"),
-//    ];
-//    \App\Models\User::query()->whereIn('id', $uidArr)->update($update);
     $sql = sprintf(
-        "update users set enabled = '%s', modcomment = concat_ws('\n', '%s - [CLEANUP] %s', modcomment) where id in (%s)",
+        "update users set enabled = '%s', modcomment = concat_ws('\n', '%s [CLEANUP] %s', modcomment) where id in (%s)",
         \App\Models\User::ENABLED_NO, date('Y-m-d'), addslashes($reasonKey), implode(', ', $uidArr)
     );
     sql_query($sql);
diff --git a/include/cleanup_cli.php b/include/cleanup_cli.php
index e2673f5e..8b1fd705 100644
--- a/include/cleanup_cli.php
+++ b/include/cleanup_cli.php
@@ -22,8 +22,8 @@ if (isset($_SERVER['argv'][1])) {
 
 try {
     if ($force) {
-        require_once($rootpath . 'include/cleanup.php');
-        return docleanup(1, true);
+        require_once(ROOT_PATH . 'include/cleanup.php');
+        $result = docleanup(1, true);
     } else {
         $result = autoclean();
     }