diff --git a/app/workers/builds.php b/app/workers/builds.php
index f8a5d045f0..59490869dc 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -166,9 +166,6 @@ class BuildsV1 extends Worker
             );
 
             /** Update the build document */
-
-            //$response['endTime'] = DateTime::format((new \DateTime())->setTimestamp($response['endTime'])); //todo: fix to datetime
-
             $build->setAttribute('endTime', $response['endTime']);
             $build->setAttribute('duration', $response['duration']);
             $build->setAttribute('status', $response['status']);
diff --git a/src/Appwrite/Stats/Usage.php b/src/Appwrite/Stats/Usage.php
index 31276904f4..d60f9bf4a4 100644
--- a/src/Appwrite/Stats/Usage.php
+++ b/src/Appwrite/Stats/Usage.php
@@ -191,12 +191,10 @@ class Usage
     protected array $periods = [
         [
             'key' => '30m',
-            //'multiplier' => 1800,
             'startTime' => '-24 hours',
         ],
         [
             'key' => '1d',
-            //'multiplier' => 86400,
             'startTime' => '-90 days',
         ],
     ];
diff --git a/tests/e2e/Services/Teams/TeamsBaseServer.php b/tests/e2e/Services/Teams/TeamsBaseServer.php
index 912d73ec3a..a0a06556ff 100644
--- a/tests/e2e/Services/Teams/TeamsBaseServer.php
+++ b/tests/e2e/Services/Teams/TeamsBaseServer.php
@@ -62,7 +62,6 @@ trait TeamsBaseServer
         $this->assertNotEmpty($response['body']['teamId']);
         $this->assertCount(2, $response['body']['roles']);
         $this->assertEquals(true, DateTime::isValid($response['body']['joined']));
-        $this->assertGreaterThan('2020-07-07 07:58:44', DateTime::now());
         $this->assertEquals(true, $response['body']['confirm']);
 
         $userUid = $response['body']['userId'];
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index 9f6bc4f76a..df79c6317b 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -861,7 +861,7 @@ trait WebhooksBase
         $this->assertNotEmpty($webhook['data']['userId']);
         $this->assertNotEmpty($webhook['data']['teamId']);
         $this->assertCount(2, $webhook['data']['roles']);
-        $this->assertEquals(false, DateTime::isValid($webhook['data']['invited']));
+        $this->assertEquals(true, DateTime::isValid($webhook['data']['invited']));
         $this->assertEquals(('server' === $this->getSide()), $webhook['data']['confirm']);
 
         /**