diff --git a/src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php b/src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
index 2824f4e286..5f0ecbe1db 100644
--- a/src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
+++ b/src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
@@ -2,17 +2,16 @@
 
 namespace Appwrite\Platform\Tasks;
 
-use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
 use Utopia\Platform\Action;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Pools\Group;
 use Utopia\Registry\Registry;
+use Utopia\Validator\Boolean;
 
 class DeleteOrphanedProjects extends Action
 {
@@ -25,18 +24,19 @@ class DeleteOrphanedProjects extends Action
     {
 
         $this
-            ->desc('Get stats for projects')
+            ->desc('Delete orphaned projects')
+            ->param('commit', false, new Boolean(true), 'Commit  project deletion', true)
             ->inject('pools')
             ->inject('cache')
             ->inject('dbForConsole')
             ->inject('register')
-            ->callback(function (Group $pools, Cache $cache, Database $dbForConsole, Registry $register) {
-                $this->action($pools, $cache, $dbForConsole, $register);
+            ->callback(function (bool $commit, Group $pools, Cache $cache, Database $dbForConsole, Registry $register) {
+                $this->action($commit, $pools, $cache, $dbForConsole, $register);
             });
     }
 
 
-    public function action(Group $pools, Cache $cache, Database $dbForConsole, Registry $register): void
+    public function action(bool $commit, Group $pools, Cache $cache, Database $dbForConsole, Registry $register): void
     {
 
         Console::title('Delete orphaned projects V1');
@@ -54,7 +54,8 @@ class DeleteOrphanedProjects extends Action
         $totalProjects = $dbForConsole->count('projects');
         Console::success("Found a total of: {$totalProjects} projects");
 
-        $orphans = 0;
+        $orphans = 1;
+        $cnt = 0;
         $count = 0;
         $limit = 30;
         $sum = 30;
@@ -79,19 +80,43 @@ class DeleteOrphanedProjects extends Action
                     $dbForProject = new Database($adapter, $cache);
                     $dbForProject->setDefaultDatabase('appwrite');
                     $dbForProject->setNamespace('_' . $project->getInternalId());
-                    $collectionsCreated = $dbForProject->count(Database::METADATA);
-                    $message = ' (' . $collectionsCreated . ') collections where found on project (' . $project->getId() . '))';
-                    if ($collectionsCreated < (count($collectionsConfig) + 2)) {
-                        Console::error($message);
-                        $orphans++;
-                    } else {
-                        Console::log($message);
+                    $collectionsCreated = 0;
+                    $cnt++;
+                    if ($dbForProject->exists($dbForProject->getDefaultDatabase(), Database::METADATA)) {
+                        $collectionsCreated = $dbForProject->count(Database::METADATA);
                     }
-                } catch (\Throwable $th) {
-                    //$dbForConsole->deleteDocument('projects', $project->getId());
-                    //Console::success('Deleting  project (' . $project->getId() . ')');
-                    Console::error(' (0) collections where found for project (' . $project->getId() . ')');
+
+                    $msg = '(' . $cnt . ') found (' . $collectionsCreated . ') collections on project  (' . $project->getInternalId() . ') , database (' . $project['database'] . ')';
+                    /**
+                     * +2 = audit+abuse
+                     */
+                    if ($collectionsCreated === (count($collectionsConfig) + 2)) {
+                        Console::log($msg . ' ignoring....');
+                        continue;
+                    }
+
+                    Console::log($msg);
+
+                    if ($collectionsCreated > 0) {
+                        $collections = $dbForProject->find(Database::METADATA, []);
+                        foreach ($collections as $collection) {
+                            if ($commit) {
+                                $dbForProject->deleteCollection($collection->getId());
+                                $dbForConsole->deleteCachedCollection($collection->getId());
+                            }
+                            Console::info('--Deleting collection  (' . $collection->getId() . ') project no (' . $project->getInternalId() . ')');
+                        }
+                    }
+                    if ($commit) {
+                        $dbForConsole->deleteDocument('projects', $project->getId());
+                        $dbForConsole->deleteCachedDocument('projects', $project->getId());
+                    }
+
+                    Console::info('--Deleting project no (' . $project->getInternalId() . ')');
+
                     $orphans++;
+                } catch (\Throwable $th) {
+                        Console::error('Error: ' . $th->getMessage());
                 } finally {
                     $pools
                         ->get($db)
@@ -110,6 +135,6 @@ class DeleteOrphanedProjects extends Action
             $count = $count + $sum;
         }
 
-        Console::log('Iterated through ' . $count - 1 . '/' . $totalProjects . ' projects found ' . $orphans . ' orphans');
+        Console::log('Iterated through ' . $count - 1 . '/' . $totalProjects . ' projects found ' . $orphans - 1 . ' orphans');
     }
 }
diff --git a/src/Appwrite/Usage/Calculators/TimeSeries.php b/src/Appwrite/Usage/Calculators/TimeSeries.php
index e0a12b443f..6dbf49c44c 100644
--- a/src/Appwrite/Usage/Calculators/TimeSeries.php
+++ b/src/Appwrite/Usage/Calculators/TimeSeries.php
@@ -8,6 +8,7 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use InfluxDB\Database as InfluxDatabase;
 use DateTime;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Registry\Registry;
 
 class TimeSeries extends Calculator
@@ -426,32 +427,34 @@ class TimeSeries extends Calculator
         $project = $this->database->getDocument('projects', $projectId);
         $database = call_user_func($this->getProjectDB, $project);
 
-        try {
-            $document = $database->getDocument('stats', $id);
-            if ($document->isEmpty()) {
-                $database->createDocument('stats', new Document([
-                    '$id' => $id,
-                    'period' => $period,
-                    'time' => $time,
-                    'metric' => $metric,
-                    'value' => $value,
-                    'type' => $type,
-                    'region' => $this->region,
-                ]));
-            } else {
-                $database->updateDocument(
-                    'stats',
-                    $document->getId(),
-                    $document->setAttribute('value', $value)
-                );
+        Authorization::skip(function () use ($database, $id, $period, $time, $metric, $value, $type, $projectId) {
+            try {
+                $document = $database->getDocument('stats', $id);
+                if ($document->isEmpty()) {
+                    $database->createDocument('stats', new Document([
+                        '$id' => $id,
+                        'period' => $period,
+                        'time' => $time,
+                        'metric' => $metric,
+                        'value' => $value,
+                        'type' => $type,
+                        'region' => $this->region,
+                    ]));
+                } else {
+                    $database->updateDocument(
+                        'stats',
+                        $document->getId(),
+                        $document->setAttribute('value', $value)
+                    );
+                }
+            } catch (\Exception $e) { // if projects are deleted this might fail
+                if (is_callable($this->errorHandler)) {
+                    call_user_func($this->errorHandler, $e, "sync_project_{$projectId}_metric_{$metric}");
+                } else {
+                    throw $e;
+                }
             }
-        } catch (\Exception $e) { // if projects are deleted this might fail
-            if (is_callable($this->errorHandler)) {
-                call_user_func($this->errorHandler, $e, "sync_project_{$projectId}_metric_{$metric}");
-            } else {
-                throw $e;
-            }
-        }
+        });
 
         $this->register->get('pools')->reclaim();
     }