diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 5a0f0850e8..3c3e385b34 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -127,6 +127,8 @@ module.exports = {
           },
         ],
         '@typescript-eslint/no-floating-promises': 'error',
+        'sonarjs/no-unused-collection': 'warn',
+        'sonarjs/no-inverted-boolean-check': 'warn',
         ...rulesToExtends,
         'no-lonely-if': 'off',
         'object-shorthand': 'off',
diff --git a/packages/services/api/src/modules/schema/providers/schema-publisher.ts b/packages/services/api/src/modules/schema/providers/schema-publisher.ts
index 1a2ae3c5ef..33a8ed6ff6 100644
--- a/packages/services/api/src/modules/schema/providers/schema-publisher.ts
+++ b/packages/services/api/src/modules/schema/providers/schema-publisher.ts
@@ -1302,14 +1302,6 @@ export class SchemaPublisher {
               })
             : null;
 
-        const contractIdToLatestValidContractVersionId = new Map<string, string | null>();
-        for (const contract of contracts ?? []) {
-          contractIdToLatestValidContractVersionId.set(
-            contract.contract.id,
-            contract.latestValidVersion?.id ?? null,
-          );
-        }
-
         const deleteResult = await this.models[project.type][modelVersion].delete({
           input: {
             serviceName: input.serviceName,
@@ -1648,14 +1640,6 @@ export class SchemaPublisher {
           })
         : null;
 
-    const contractIdToLatestValidContractVersionId = new Map<string, string | null>();
-    for (const contract of contracts ?? []) {
-      contractIdToLatestValidContractVersionId.set(
-        contract.contract.id,
-        contract.latestValidVersion?.id ?? null,
-      );
-    }
-
     const compareToPreviousComposableVersion = shouldUseLatestComposableVersion(
       target.id,
       project,
diff --git a/packages/services/emails/src/environment.ts b/packages/services/emails/src/environment.ts
index 183ce26bcb..388dba4379 100644
--- a/packages/services/emails/src/environment.ts
+++ b/packages/services/emails/src/environment.ts
@@ -166,7 +166,7 @@ const emailProviderConfig =
             pass: email.EMAIL_PROVIDER_SMTP_AUTH_PASSWORD,
           },
           tls: {
-            rejectUnauthorized: !(email.EMAIL_PROVIDER_SMTP_REJECT_UNAUTHORIZED === '0'),
+            rejectUnauthorized: email.EMAIL_PROVIDER_SMTP_REJECT_UNAUTHORIZED !== '0',
           },
         } as const)
       : email.EMAIL_PROVIDER === 'sendmail'