diff --git a/composer.json b/composer.json
index 62976b4413..f3334f95f9 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "utopia-php/preloader": "0.2.*",
         "utopia-php/queue": "0.5.*",
         "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "dev-feat-transfer as 0.13.3",
+        "utopia-php/storage": "0.16.*",
         "utopia-php/swoole": "0.5.*",
         "utopia-php/websocket": "0.1.0",
         "resque/php-resque": "1.3.6",
diff --git a/src/Appwrite/Platform/Tasks/Restore.php b/src/Appwrite/Platform/Tasks/Restore.php
index 36e205090b..2c2a88ceb6 100644
--- a/src/Appwrite/Platform/Tasks/Restore.php
+++ b/src/Appwrite/Platform/Tasks/Restore.php
@@ -63,8 +63,9 @@ class Restore extends Action
         }
 
         $this->log('--- Restore Start ' . $id . ' --- ');
-        $filename = $id . '.xbstream';
+
         $start = microtime(true);
+        $filename = $id . '.xbstream';
         $cloud = $cloud === 'true' || $cloud === '1';
         $destination = new Local(self::BACKUPS_PATH . '/restore/' . $id);
         $files = $destination->getRoot() . '/files';
@@ -157,9 +158,6 @@ class Restore extends Action
 
         $args = [
             'xtrabackup',
-//            '--user=' . $this->dsn->getUser(),
-//            '--password=' . $this->dsn->getPassword(),
-//            '--host=' . $this->dsn->getHost(),
             '--prepare',
             '--strict',
             '--target-dir=' . $target,
@@ -190,9 +188,6 @@ class Restore extends Action
 
         $args = [
             'xtrabackup',
-//            '--user=' . $this->dsn->getUser(),
-//            '--password=' . $this->dsn->getPassword(),
-//            '--host=' . $this->dsn->getHost(),
             '--move-back',
             '--strict',
             '--target-dir=' . $target,