diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 82c2f092ee..f764c4c3ea 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -332,7 +332,7 @@ App::post('/v1/account')
         $identityWithMatchingEmail = $dbForProject->findOne('identities', [
             Query::equal('providerEmail', [$email]),
         ]);
-        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+        if (!$identityWithMatchingEmail->isEmpty()) {
             throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
         }
 
@@ -1405,7 +1405,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::equal('provider', [$provider]),
                 Query::equal('providerUid', [$oauth2ID]),
             ]);
-            if ($session !== false && !$session->isEmpty()) {
+            if (!$session->isEmpty()) {
                 $user->setAttributes($dbForProject->getDocument('users', $session->getAttribute('userId'))->getArrayCopy());
             }
         }
@@ -1423,7 +1423,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
             $userWithEmail = $dbForProject->findOne('users', [
                 Query::equal('email', [$email]),
             ]);
-            if ($userWithEmail !== false && !$userWithEmail->isEmpty()) {
+            if (!$userWithEmail->isEmpty()) {
                 $user->setAttributes($userWithEmail->getArrayCopy());
             }
 
@@ -1434,7 +1434,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                     Query::equal('providerUid', [$oauth2ID]),
                 ]);
 
-                if ($identity !== false && !$identity->isEmpty()) {
+                if (!$identity->isEmpty()) {
                     $user = $dbForProject->getDocument('users', $identity->getAttribute('userId'));
                 }
             }
@@ -1454,7 +1454,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                     Query::equal('providerEmail', [$email]),
                 ]);
-                if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+                if (!$identityWithMatchingEmail->isEmpty()) {
                     throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
                 }
 
@@ -1517,7 +1517,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
             Query::equal('provider', [$provider]),
             Query::equal('providerUid', [$oauth2ID]),
         ]);
-        if ($identity === false || $identity->isEmpty()) {
+        if ($identity->isEmpty()) {
             // Before creating the identity, check if the email is already associated with another user
             $userId = $user->getId();
 
@@ -1801,7 +1801,7 @@ App::post('/v1/account/tokens/magic-url')
         $isAppUser = Auth::isAppUser($roles);
 
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
-        if ($result !== false && !$result->isEmpty()) {
+        if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
         } else {
             $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -1818,7 +1818,7 @@ App::post('/v1/account/tokens/magic-url')
             $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                 Query::equal('providerEmail', [$email]),
             ]);
-            if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+            if (!$identityWithMatchingEmail->isEmpty()) {
                 throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
             }
 
@@ -2042,7 +2042,7 @@ App::post('/v1/account/tokens/email')
         $isAppUser = Auth::isAppUser($roles);
 
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
-        if ($result !== false && !$result->isEmpty()) {
+        if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
         } else {
             $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -2059,7 +2059,7 @@ App::post('/v1/account/tokens/email')
             $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                 Query::equal('providerEmail', [$email]),
             ]);
-            if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+            if (!$identityWithMatchingEmail->isEmpty()) {
                 throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
             }
 
@@ -2329,7 +2329,7 @@ App::post('/v1/account/tokens/phone')
         $isAppUser = Auth::isAppUser($roles);
 
         $result = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
-        if ($result !== false && !$result->isEmpty()) {
+        if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
         } else {
             $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -2753,7 +2753,7 @@ App::patch('/v1/account/email')
             Query::equal('providerEmail', [$email]),
             Query::notEqual('userInternalId', $user->getInternalId()),
         ]);
-        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+        if (!$identityWithMatchingEmail->isEmpty()) {
             throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
         }
 
@@ -2774,7 +2774,7 @@ App::patch('/v1/account/email')
             Query::equal('identifier', [$email]),
         ]));
 
-        if ($target instanceof Document && !$target->isEmpty()) {
+        if (!$target->isEmpty()) {
             throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
         }
 
@@ -2840,7 +2840,7 @@ App::patch('/v1/account/phone')
             Query::equal('identifier', [$phone]),
         ]));
 
-        if ($target instanceof Document && !$target->isEmpty()) {
+        if (!$target->isEmpty()) {
             throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
         }
 
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 290eed8651..8815611021 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -2324,7 +2324,7 @@ App::delete('/v1/functions/:functionId/executions/:executionId')
                 Query::equal('active', [true]),
             ]);
 
-            if ($schedule && !$schedule->isEmpty()) {
+            if (!$schedule->isEmpty()) {
                 $schedule
                     ->setAttribute('resourceUpdatedAt', DateTime::now())
                     ->setAttribute('active', false);
diff --git a/app/controllers/api/migrations.php b/app/controllers/api/migrations.php
index a4880cef86..bebb6ebaea 100644
--- a/app/controllers/api/migrations.php
+++ b/app/controllers/api/migrations.php
@@ -121,7 +121,7 @@ App::post('/v1/migrations/firebase/oauth')
             Query::equal('provider', ['firebase']),
             Query::equal('userInternalId', [$user->getInternalId()]),
         ]);
-        if ($identity === false || $identity->isEmpty()) {
+        if ($identity->isEmpty()) {
             throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
@@ -576,7 +576,7 @@ App::get('/v1/migrations/firebase/report/oauth')
             Query::equal('userInternalId', [$user->getInternalId()]),
         ]);
 
-        if ($identity === false || $identity->isEmpty()) {
+        if ($identity->isEmpty()) {
             throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
@@ -751,13 +751,13 @@ App::get('/v1/migrations/firebase/redirect')
                 Query::equal('providerEmail', [$email]),
             ]);
 
-            if ($identity !== false && !$identity->isEmpty()) {
+            if (!$identity->isEmpty()) {
                 if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
                     throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
                 }
             }
 
-            if ($identity !== false && !$identity->isEmpty()) {
+            if (!$identity->isEmpty()) {
                 $identity = $identity
                     ->setAttribute('providerAccessToken', $accessToken)
                     ->setAttribute('providerRefreshToken', $refreshToken)
@@ -820,7 +820,7 @@ App::get('/v1/migrations/firebase/projects')
             Query::equal('userInternalId', [$user->getInternalId()]),
         ]);
 
-        if ($identity === false || $identity->isEmpty()) {
+        if ($identity->isEmpty()) {
             throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
         }
 
@@ -900,7 +900,7 @@ App::get('/v1/migrations/firebase/deauthorize')
             Query::equal('userInternalId', [$user->getInternalId()]),
         ]);
 
-        if ($identity === false || $identity->isEmpty()) {
+        if ($identity->isEmpty()) {
             throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Not authenticated with Firebase'); //TODO: Replace with USER_IDENTITY_NOT_FOUND
         }
 
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3bfa416bd8..5705e7576b 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1060,7 +1060,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($webhook === false || $webhook->isEmpty()) {
+        if ($webhook->isEmpty()) {
             throw new Exception(Exception::WEBHOOK_NOT_FOUND);
         }
 
@@ -1103,7 +1103,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($webhook === false || $webhook->isEmpty()) {
+        if ($webhook->isEmpty()) {
             throw new Exception(Exception::WEBHOOK_NOT_FOUND);
         }
 
@@ -1153,7 +1153,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($webhook === false || $webhook->isEmpty()) {
+        if ($webhook->isEmpty()) {
             throw new Exception(Exception::WEBHOOK_NOT_FOUND);
         }
 
@@ -1191,7 +1191,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($webhook === false || $webhook->isEmpty()) {
+        if ($webhook->isEmpty()) {
             throw new Exception(Exception::WEBHOOK_NOT_FOUND);
         }
 
@@ -1313,7 +1313,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($key === false || $key->isEmpty()) {
+        if ($key->isEmpty()) {
             throw new Exception(Exception::KEY_NOT_FOUND);
         }
 
@@ -1350,7 +1350,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($key === false || $key->isEmpty()) {
+        if ($key->isEmpty()) {
             throw new Exception(Exception::KEY_NOT_FOUND);
         }
 
@@ -1392,7 +1392,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($key === false || $key->isEmpty()) {
+        if ($key->isEmpty()) {
             throw new Exception(Exception::KEY_NOT_FOUND);
         }
 
@@ -1550,7 +1550,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($platform === false || $platform->isEmpty()) {
+        if ($platform->isEmpty()) {
             throw new Exception(Exception::PLATFORM_NOT_FOUND);
         }
 
@@ -1587,7 +1587,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($platform === false || $platform->isEmpty()) {
+        if ($platform->isEmpty()) {
             throw new Exception(Exception::PLATFORM_NOT_FOUND);
         }
 
@@ -1631,7 +1631,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
             Query::equal('projectInternalId', [$project->getInternalId()]),
         ]);
 
-        if ($platform === false || $platform->isEmpty()) {
+        if ($platform->isEmpty()) {
             throw new Exception(Exception::PLATFORM_NOT_FOUND);
         }
 
diff --git a/app/controllers/api/proxy.php b/app/controllers/api/proxy.php
index 984a9fb974..02a3ec8e9d 100644
--- a/app/controllers/api/proxy.php
+++ b/app/controllers/api/proxy.php
@@ -64,7 +64,7 @@ App::post('/v1/proxy/rules')
             Query::equal('domain', [$domain]),
         ]);
 
-        if ($document && !$document->isEmpty()) {
+        if (!$document->isEmpty()) {
             if ($document->getAttribute('projectId') === $project->getId()) {
                 $resourceType = $document->getAttribute('resourceType');
                 $resourceId = $document->getAttribute('resourceId');
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 3d0955ad2b..0b97be0e55 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -492,7 +492,7 @@ App::post('/v1/teams/:teamId/memberships')
             $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                 Query::equal('providerEmail', [$email]),
             ]);
-            if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+            if (!$identityWithMatchingEmail->isEmpty()) {
                 throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
             }
 
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index af45c6c3ab..314e298d6b 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -64,7 +64,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
         $identityWithMatchingEmail = $dbForProject->findOne('identities', [
             Query::equal('providerEmail', [$email]),
         ]);
-        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+        if (!$identityWithMatchingEmail->isEmpty()) {
             throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
         }
     }
@@ -1232,7 +1232,7 @@ App::patch('/v1/users/:userId/email')
                 Query::equal('providerEmail', [$email]),
                 Query::notEqual('userInternalId', $user->getInternalId()),
             ]);
-            if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+            if (!$identityWithMatchingEmail->isEmpty()) {
                 throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
             }
 
diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php
index e79eb67936..bbb1d9c3f8 100644
--- a/app/controllers/api/vcs.php
+++ b/app/controllers/api/vcs.php
@@ -110,7 +110,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                     Query::orderDesc('$createdAt'),
                 ]));
 
-                if ($latestComment !== false && !$latestComment->isEmpty()) {
+                if (!$latestComment->isEmpty()) {
                     $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
                     $comment = new Comment();
                     $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
@@ -371,13 +371,11 @@ App::get('/v1/vcs/github/callback')
             $identity = $dbForConsole->findOne('identities', [
                 Query::equal('providerEmail', [$email]),
             ]);
-            if ($identity !== false && !$identity->isEmpty()) {
+            if (!$identity->isEmpty()) {
                 if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
                     throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
                 }
-            }
 
-            if ($identity !== false && !$identity->isEmpty()) {
                 $identity = $identity
                     ->setAttribute('providerAccessToken', $accessToken)
                     ->setAttribute('providerRefreshToken', $refreshToken)
@@ -418,7 +416,7 @@ App::get('/v1/vcs/github/callback')
                 Query::equal('projectInternalId', [$projectInternalId])
             ]);
 
-            if ($installation === false || $installation->isEmpty()) {
+            if ($installation->isEmpty()) {
                 $teamId = $project->getAttribute('teamId', '');
 
                 $installation = new Document([
@@ -726,7 +724,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
                 Query::equal('provider', ['github']),
                 Query::equal('userInternalId', [$user->getInternalId()]),
             ]);
-            if ($identity === false || $identity->isEmpty()) {
+            if ($identity->isEmpty()) {
                 throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
             }
 
diff --git a/app/init.php b/app/init.php
index a558c0fa25..e962c58b67 100644
--- a/app/init.php
+++ b/app/init.php
@@ -1812,9 +1812,6 @@ App::setResource('team', function (Document $project, Database $dbForConsole, Ap
         ]);
     });
 
-    if (!$team) {
-        $team = new Document([]);
-    }
     return $team;
 }, ['project', 'dbForConsole', 'utopia', 'request']);
 
diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php
index f25a85fb10..a14f164295 100644
--- a/src/Appwrite/Platform/Workers/Certificates.php
+++ b/src/Appwrite/Platform/Workers/Certificates.php
@@ -216,7 +216,7 @@ class Certificates extends Action
     {
         // Check if update or insert required
         $certificateDocument = $dbForConsole->findOne('certificates', [Query::equal('domain', [$domain])]);
-        if (!empty($certificateDocument) && !$certificateDocument->isEmpty()) {
+        if (!$certificateDocument->isEmpty()) {
             // Merge new data with current data
             $certificate = new Document(\array_merge($certificateDocument->getArrayCopy(), $certificate->getArrayCopy()));
             $certificate = $dbForConsole->updateDocument('certificates', $certificate->getId(), $certificate);
@@ -482,7 +482,7 @@ class Certificates extends Action
             Query::equal('domain', [$domain]),
         ]);
 
-        if ($rule !== false && !$rule->isEmpty()) {
+        if (!$rule->isEmpty()) {
             $rule->setAttribute('certificateId', $certificateId);
             $rule->setAttribute('status', $success ? 'verified' : 'unverified');
             $dbForConsole->updateDocument('rules', $rule->getId(), $rule);
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 510fec0431..58f6265ff4 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -178,7 +178,7 @@ class Messaging extends Action
             Query::equal('type', [$providerType]),
         ]);
 
-        if ($default === false || $default->isEmpty()) {
+        if ($default->isEmpty()) {
             $dbForProject->updateDocument('messages', $message->getId(), $message->setAttributes([
                 'status' => MessageStatus::FAILED,
                 'deliveryErrors' => ['No enabled provider found.']