diff --git a/EstateManagementUI.BusinessLogic.Tests/PermissionsServiceTests.cs b/EstateManagementUI.BusinessLogic.Tests/PermissionsServiceTests.cs
index 54524b6b..bf57229d 100644
--- a/EstateManagementUI.BusinessLogic.Tests/PermissionsServiceTests.cs
+++ b/EstateManagementUI.BusinessLogic.Tests/PermissionsServiceTests.cs
@@ -11,6 +11,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using EstateManagementUI.BusinessLogic.Common;
+using EstateManagementUI.BusinessLogic.PermissionService.Database.Entities;
 using Xunit;
 
 namespace EstateManagementUI.BusinessLogic.Tests
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ApplicationSections.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ApplicationSections.cs
index 3abeebe6..a34ca56d 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ApplicationSections.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ApplicationSections.cs
@@ -5,11 +5,11 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public class ApplicationSections
 {
-    public const string Dashboard = "Dashboard";
-    public const string Estate = "Estate";
-    public const string Merchant = "Merchant";
-    public const string Contract = "Contract";
-    public const string Operator = "Operator";
-    public const string FileProcessing = "FileProcessing";
-    public const string Reporting = "Reporting";
+    public static readonly string Dashboard = "Dashboard";
+    public static readonly string Estate = "Estate";
+    public static readonly string Merchant = "Merchant";
+    public static readonly string Contract = "Contract";
+    public static readonly string Operator = "Operator";
+    public static readonly string FileProcessing = "FileProcessing";
+    public static readonly string Reporting = "Reporting";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ContractFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ContractFunctions.cs
index c1f939c1..b2ce7750 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ContractFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ContractFunctions.cs
@@ -5,15 +5,15 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public record ContractFunctions
 {
-    public const string ViewList = "View Contracts List";
-    public const string ViewProductsList = "View Contract Products List";
-    public const string ViewProductFeesList = "View Contract Product Fees List";
-    public const string View = "View Contract";
-    public const string Edit = "Edit Contract";
-    public const string New = "New Contract";
-    //public const string Remove = "Remove Contract";
-    public const string AddProduct = "Add Product";
-    //public const string RemoveProduct = "Remove Product";
-    public const string AddTransactionFee = "Add Transaction Fee";
-    //public const string RemoveTransactionFee = "Remove Transaction Fee";
+    public static readonly string ViewList = "View Contracts List";
+    public static readonly string ViewProductsList = "View Contract Products List";
+    public static readonly string ViewProductFeesList = "View Contract Product Fees List";
+    public static readonly string View = "View Contract";
+    public static readonly string Edit = "Edit Contract";
+    public static readonly string New = "New Contract";
+    //public static readonly  string Remove = "Remove Contract";
+    public static readonly string AddProduct = "Add Product";
+    //public static readonly  string RemoveProduct = "Remove Product";
+    public static readonly string AddTransactionFee = "Add Transaction Fee";
+    //public static readonly  string RemoveTransactionFee = "Remove Transaction Fee";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/DashboardFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/DashboardFunctions.cs
index 081c8646..33546502 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/DashboardFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/DashboardFunctions.cs
@@ -6,5 +6,5 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 public class DashboardFunctions
 {
 
-    public const string Dashboard = "Dashboard";
+    public static readonly string Dashboard = "Dashboard";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/EstateFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/EstateFunctions.cs
index e37dcbb9..c0580bec 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/EstateFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/EstateFunctions.cs
@@ -5,13 +5,13 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public record EstateFunctions
 {
-    public const string View = "View Estate";
-    public const string ViewUsersList = "View Estate Users";
-    public const string ViewOperatorsList = "View Estate Operators";
-    
-    //public const string Edit = "Edit Estate";
-    //public const string AddOperator = "Add Operator";
-    //public const string RemoveOperator = "Remove Operator";
-    //public const string AddUser = "Add User";
-    //public const string RemoveUser = "Remove User";
+    public static readonly string View = "View Estate";
+    public static readonly string ViewUsersList = "View Estate Users";
+    public static readonly string ViewOperatorsList = "View Estate Operators";
+
+    //public static readonly string Edit = "Edit Estate";
+    //public static readonly string AddOperator = "Add Operator";
+    //public static readonly string RemoveOperator = "Remove Operator";
+    //public static readonly string AddUser = "Add User";
+    //public static readonly string RemoveUser = "Remove User";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/FileProcessingFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/FileProcessingFunctions.cs
index e3572e30..548f508f 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/FileProcessingFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/FileProcessingFunctions.cs
@@ -4,7 +4,7 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 
 [ExcludeFromCodeCoverage]
 public record FileProcessingFunctions {
-    public const String ViewImportLogList = "View Import Log List";
-    public const String ViewImportLog = "View Import Log";
-    public const String ViewFileDetails = "View File Details";
+    public static readonly String ViewImportLogList = "View Import Log List";
+    public static readonly String ViewImportLog = "View Import Log";
+    public static readonly String ViewFileDetails = "View File Details";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/MerchantFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/MerchantFunctions.cs
index ac5d36db..72c886ae 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/MerchantFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/MerchantFunctions.cs
@@ -5,18 +5,18 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public class MerchantFunctions
 {
-    public const string ViewList = "View Merchant List";
-    public const string View = "View Single Merchant";
-    public const string Edit = "Edit Merchant";
-    public const string New = "New Merchant";
-    //public const string Remove = "Remove Merchant";
-    public const string AddOperator = "Add Operator";
-    public const string RemoveOperator = "Remove Operator";
-    public const string AddContract = "Add Contract";
-    public const string RemoveContract = "Remove Contract";
-    public const string AddDevice = "Add Device";
-    //public const string RemoveDevice = "Remove Device";
-    //public const string EditAddress = "Edit Merchant Address";
-    //public const string EditContact = "Edit Merchant Contact";
-    public const string MakeDeposit = "Make Deposit";
+    public static readonly string ViewList = "View Merchant List";
+    public static readonly string View = "View Single Merchant";
+    public static readonly string Edit = "Edit Merchant";
+    public static readonly string New = "New Merchant";
+    //public static readonly string Remove = "Remove Merchant";
+    public static readonly string AddOperator = "Add Operator";
+    public static readonly string RemoveOperator = "Remove Operator";
+    public static readonly string AddContract = "Add Contract";
+    public static readonly string RemoveContract = "Remove Contract";
+    public static readonly string AddDevice = "Add Device";
+    //public static readonly string RemoveDevice = "Remove Device";
+    //public static readonly string EditAddress = "Edit Merchant Address";
+    //public static readonly string EditContact = "Edit Merchant Contact";
+    public static readonly string MakeDeposit = "Make Deposit";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/OperatorFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/OperatorFunctions.cs
index 74b6ab1d..e631ed8e 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/OperatorFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/OperatorFunctions.cs
@@ -5,9 +5,9 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public class OperatorFunctions
 {
-    public const string ViewList = "View Operators List";
-    public const string View = "View Single Operator";
-    public const string Edit = "Edit Operator";
-    public const string New = "New Operator";
-    public const string Remove = "Remove Operator";
+    public static readonly string ViewList = "View Operators List";
+    public static readonly string View = "View Single Operator";
+    public static readonly string Edit = "Edit Operator";
+    public static readonly string New = "New Operator";
+    public static readonly string Remove = "Remove Operator";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ReportingFunctions.cs b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ReportingFunctions.cs
index cbd5b936..1d010e1b 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/Constants/ReportingFunctions.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/Constants/ReportingFunctions.cs
@@ -5,6 +5,6 @@ namespace EstateManagementUI.BusinessLogic.PermissionService.Constants;
 [ExcludeFromCodeCoverage]
 public record ReportingFunctions
 {
-    public const String TransactionAnalysis = "View Transaction Analysis";
-    public const String SettlementAnalysis = "View Settlement Analysis";
+    public static readonly String TransactionAnalysis = "View Transaction Analysis";
+    public static readonly String SettlementAnalysis = "View Settlement Analysis";
 }
\ No newline at end of file
diff --git a/EstateManagementUI.BusinessLogic/PermissionService/PermissionsRepository.cs b/EstateManagementUI.BusinessLogic/PermissionService/PermissionsRepository.cs
index fadb9f34..c69d3d32 100644
--- a/EstateManagementUI.BusinessLogic/PermissionService/PermissionsRepository.cs
+++ b/EstateManagementUI.BusinessLogic/PermissionService/PermissionsRepository.cs
@@ -59,7 +59,6 @@ public PermissionsRepository(IDbContextFactory<PermissionsContext> permissionsCo
     public async Task<Result> MigrateDatabase(CancellationToken cancellationToken) {
         PermissionsContext context = await this.PermissionsContextFactory.CreateDbContextAsync(cancellationToken);
         try {
-            var conn = context.Database.GetConnectionString();
             await context.Database.MigrateAsync(cancellationToken);
             return Result.Success();
         }
@@ -116,11 +115,6 @@ private async Task<Result> AddApplicationFunction(PermissionsContext context, Fu
         
 
         try {
-            if (function.Name == "New Merchant") {
-                var f = context.Functions.Where(f => f.ApplicationSectionId == function.ApplicationSectionId &&
-                                                     f.Name == function.Name).ToList();
-            }
-
             await context.Functions.AddAsync(function, cancellationToken);
             await context.SaveChangesAsync(cancellationToken);
             return Result.Success();
@@ -331,7 +325,7 @@ public List<String> GetApplicationSections() {
     {
         return typeof(T)
             .GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)
-            .Where(field => field.IsLiteral && !field.IsInitOnly)
+            .Where(field => field.IsStatic && field.FieldType == typeof(string))
             .Select(field => (category, (string)field.GetValue(null)))
             .ToList();
     }
@@ -340,7 +334,7 @@ public static List<string> GetActions<T>()
     {
         return typeof(T)
             .GetFields(BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)
-            .Where(field => field.IsLiteral && !field.IsInitOnly)
+            .Where(field => field.IsStatic && field.FieldType == typeof(string))
             .Select(field => (string)field.GetValue(null))
             .ToList();
     }
diff --git a/EstateManagementUI/Common/ChartBuilder.cs b/EstateManagementUI/Common/ChartBuilder.cs
index 1312e883..2590c8e6 100644
--- a/EstateManagementUI/Common/ChartBuilder.cs
+++ b/EstateManagementUI/Common/ChartBuilder.cs
@@ -227,7 +227,6 @@ public static String BuildLineChartOptions<T>(List<String> categories,
             Converters = new List<JsonConverter> { new JavaScriptFunctionConverter() },
         };
 
-        var x = JsonConvert.SerializeObject(chartOptions, settings);
         return JsonConvert.SerializeObject(chartOptions, settings);
     }
 
@@ -291,14 +290,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
             throw new NotImplementedException();
         }
 
-        public override bool CanConvert(Type objectType)
-        {
-            if (objectType == typeof(JavaScriptFunction)) {
-                int i = 0;
-            }
-
-            return objectType == typeof(JavaScriptFunction);
-        }
+        public override bool CanConvert(Type objectType) => objectType == typeof(JavaScriptFunction);
     }
 
     public class StandardJavascriptFunctions {
diff --git a/EstateManagementUI/Pages/Contract/Contract/NewContract.cshtml.cs b/EstateManagementUI/Pages/Contract/Contract/NewContract.cshtml.cs
index 2bae987d..764c3d3a 100644
--- a/EstateManagementUI/Pages/Contract/Contract/NewContract.cshtml.cs
+++ b/EstateManagementUI/Pages/Contract/Contract/NewContract.cshtml.cs
@@ -86,6 +86,7 @@ public async Task Save()
 
         private async Task UpdateExitingContract()
         {
+            // This will be implemented later
         }
 
         public List<OptionItem> GetOperators()
diff --git a/EstateManagementUI/Pages/Index.cshtml.cs b/EstateManagementUI/Pages/Index.cshtml.cs
index 338f35bc..7551b613 100644
--- a/EstateManagementUI/Pages/Index.cshtml.cs
+++ b/EstateManagementUI/Pages/Index.cshtml.cs
@@ -12,14 +12,5 @@ public class IndexModel : PageModel
         public IndexModel() {
             Logger.LogWarning("In index page");
         }
-
-        public void OnGet()
-        {
-
-        }
-
-        public async Task LogIn() {
-
-        }
     }
 }
diff --git a/EstateManagementUI/Pages/Merchant/MerchantDetails/AddDeviceDialog.cshtml.cs b/EstateManagementUI/Pages/Merchant/MerchantDetails/AddDeviceDialog.cshtml.cs
index 27efeb46..e6d5fcd0 100644
--- a/EstateManagementUI/Pages/Merchant/MerchantDetails/AddDeviceDialog.cshtml.cs
+++ b/EstateManagementUI/Pages/Merchant/MerchantDetails/AddDeviceDialog.cshtml.cs
@@ -24,11 +24,6 @@ public class AddDeviceDialog : DeviceDialog
         public AddDeviceDialog(IMediator mediator, IPermissionsService permissionsService) : base(mediator, permissionsService, MerchantFunctions.AddContract) {
         }
 
-        public override async Task MountAsync()
-        {
-            
-        }
-
         public async Task Save() {
             await this.PopulateTokenAndEstateId();
 
diff --git a/EstateManagementUI/Pages/Reporting/Index.cshtml.cs b/EstateManagementUI/Pages/Reporting/Index.cshtml.cs
index 68a43440..17a41cd1 100644
--- a/EstateManagementUI/Pages/Reporting/Index.cshtml.cs
+++ b/EstateManagementUI/Pages/Reporting/Index.cshtml.cs
@@ -6,8 +6,5 @@ namespace EstateManagementUI.Pages.Reporting
     [ExcludeFromCodeCoverage]
     public class IndexModel : PageModel
     {
-        public void OnGet()
-        {
-        }
     }
 }
diff --git a/EstateManagementUI/Program.cs b/EstateManagementUI/Program.cs
index 08eaf087..93d31d1c 100644
--- a/EstateManagementUI/Program.cs
+++ b/EstateManagementUI/Program.cs
@@ -89,9 +89,6 @@ private static async Task<IPermissionsRepository> CreatePermissionsRepository(St
 
         // Create the DbContextFactory instance
         var contextFactory = new DbContextFactory<PermissionsContext>(serviceProvider, optionsBuilder.Options, new DbContextFactorySource<PermissionsContext>());
-
-        //var ctx = await contextFactory.CreateDbContextAsync(cancellationToken);
-
         return new PermissionsRepository(contextFactory);
     }
 
@@ -184,12 +181,10 @@ private static X509Certificate2 LoadCertificate(String path) {
 [ExcludeFromCodeCoverage]
 public static class Extensions {
     public static async Task PreWarm(this IApplicationBuilder applicationBuilder) {
-        Boolean isIntegrationTest =
-            ConfigurationReader.GetValueOrDefault<Boolean>("AppSettings", "isIntegrationTest", false);
         IPermissionsRepository permissionsRepository = Startup.Container.GetService<IPermissionsRepository>();
         Shared.Logger.Logger.LogWarning($"Before Migrate and Seed");
         Shared.Logger.Logger.LogWarning($"About to Migrate");
-        Result result = await permissionsRepository.MigrateDatabase(CancellationToken.None);
+        await permissionsRepository.MigrateDatabase(CancellationToken.None);
 
         Shared.Logger.Logger.LogWarning($"About to Seed");
         // TODO: dont do this if data already present...