diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs
index d6e26d8d4..9d16afe3d 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/Common/KeyValueComponentDefinition.cs
@@ -68,7 +68,7 @@ protected static void ValidateInputCounts(StringValues keys, StringValues labels
 
         protected static void ValidateValuesFormat(StringValues values, KeyValueType type)
         {
-            foreach (var key in values.Where(k => !IsValidInput(k ?? string.Empty)))
+            if (values.Any(k => !IsValidInput(k ?? string.Empty)))
             {
                 throw new UserFriendlyException($"The following characters are allowed for {type}: " + validInputPattern);
             }
diff --git a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
index 169350689..6c3673670 100644
--- a/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs
@@ -317,16 +317,13 @@ internal static ReportColumnsMap CreateNewMap(UpsertReportColumnsMapDto upsertRe
             // Generate column names for fields without user-provided mappings
             // For formversion provider, use Key (CHEFS Property Name) as the source; for others, use Label
             var autoGeneratedColumnNames = new Dictionary<string, string>();
-            foreach (var field in fieldsMap.Fields)
+            foreach (var field in fieldsMap.Fields.Where(f => !userProvidedMappings.ContainsKey(f.Path)))
             {
-                if (!userProvidedMappings.ContainsKey(field.Path))
-                {
-                    var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider);
-                    var sanitizedName = SanitizeColumnName(columnNameSource);
-                    var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames);
-                    autoGeneratedColumnNames[field.Path] = uniqueName;
-                    usedColumnNames.Add(uniqueName);
-                }
+                var columnNameSource = GetDefaultColumnNameSource(field, upsertReportColmnsMapDto.CorrelationProvider);
+                var sanitizedName = SanitizeColumnName(columnNameSource);
+                var uniqueName = EnsureUniqueness(sanitizedName, usedColumnNames);
+                autoGeneratedColumnNames[field.Path] = uniqueName;
+                usedColumnNames.Add(uniqueName);
             }
 
             // Create mapping rows
diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
index 29f143e88..a0178963b 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/Themes/UX2/Components/Topbar/Default.cshtml
@@ -32,8 +32,6 @@
         bool isAuthorizedForTenantSwitch = false;
         if (CurrentUser.IsAuthenticated && CurrentUser.FindClaimValue("has_multiple_tenants") == "true")
             isAuthorizedForTenantSwitch = true;
-
-        bool isAuthorizedForPaymentConfiguration = await PermissionChecker.IsGrantedAsync("SettingManagement.ConfigurePayments");
     }
     <abp-dropdown id="user-dropdown">
         <abp-dropdown-button class="btn-dropdown" text="@CurrentTenant.Name" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
index 97a608ef0..396be48bc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/IApplicantAppService.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Unity.GrantManager.Applications;
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.Intakes;
 using Unity.Modules.Shared;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
index d47e2112d..6012a3f7e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
@@ -12,7 +12,6 @@
 using Unity.Flex.Scoresheets.Enums;
 using Unity.Flex.Scoresheets.Events;
 using Unity.Flex.Worksheets.Definitions;
-using Unity.GrantManager.Applications;
 using Unity.GrantManager.Comments;
 using Unity.GrantManager.Exceptions;
 using Unity.GrantManager.Workflow;
@@ -24,7 +23,6 @@
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Features;
 using Volo.Abp.Identity.Integration;
-using Volo.Abp.Settings;
 using Volo.Abp.Users;
 using Volo.Abp.Validation;