diff --git a/Directory.Build.props b/Directory.Build.props
index 4b56322adb..131de6320a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
 
-    <Version>2025.2.1</Version>
+    <Version>2025.2.2</Version>
 
     <RootNamespace>Bit.$(MSBuildProjectName)</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/Admin/Views/Users/Edit.cshtml b/src/Admin/Views/Users/Edit.cshtml
index 8169b72b3c..dd80889110 100644
--- a/src/Admin/Views/Users/Edit.cshtml
+++ b/src/Admin/Views/Users/Edit.cshtml
@@ -9,8 +9,7 @@
 
     var canViewUserInformation = AccessControlService.UserHasPermission(Permission.User_UserInformation_View);
     var canViewNewDeviceException = AccessControlService.UserHasPermission(Permission.User_NewDeviceException_Edit) &&
-                                    GlobalSettings.EnableNewDeviceVerification &&
-                                    FeatureService.IsEnabled(Bit.Core.FeatureFlagKeys.NewDeviceVerification);
+                                    GlobalSettings.EnableNewDeviceVerification;
     var canViewBillingInformation = AccessControlService.UserHasPermission(Permission.User_BillingInformation_View);
     var canViewGeneral = AccessControlService.UserHasPermission(Permission.User_GeneralDetails_View);
     var canViewPremium = AccessControlService.UserHasPermission(Permission.User_Premium_View);
diff --git a/src/Billing/Constants/BitPayInvoiceStatus.cs b/src/Billing/Constants/BitPayInvoiceStatus.cs
new file mode 100644
index 0000000000..b9c1e5834d
--- /dev/null
+++ b/src/Billing/Constants/BitPayInvoiceStatus.cs
@@ -0,0 +1,7 @@
+namespace Bit.Billing.Constants;
+
+public static class BitPayInvoiceStatus
+{
+    public const string Confirmed = "confirmed";
+    public const string Complete = "complete";
+}
diff --git a/src/Billing/Constants/BitPayNotificationCode.cs b/src/Billing/Constants/BitPayNotificationCode.cs
new file mode 100644
index 0000000000..f1ace14b81
--- /dev/null
+++ b/src/Billing/Constants/BitPayNotificationCode.cs
@@ -0,0 +1,6 @@
+namespace Bit.Billing.Constants;
+
+public static class BitPayNotificationCode
+{
+    public const string InvoiceConfirmed = "invoice_confirmed";
+}
diff --git a/src/Billing/Controllers/BitPayController.cs b/src/Billing/Controllers/BitPayController.cs
index 3747631bd0..a8d1742fcb 100644
--- a/src/Billing/Controllers/BitPayController.cs
+++ b/src/Billing/Controllers/BitPayController.cs
@@ -1,4 +1,5 @@
 using System.Globalization;
+using Bit.Billing.Constants;
 using Bit.Billing.Models;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Billing.Services;
@@ -65,7 +66,7 @@ public class BitPayController : Controller
             return new BadRequestResult();
         }
 
-        if (model.Event.Name != "invoice_confirmed")
+        if (model.Event.Name != BitPayNotificationCode.InvoiceConfirmed)
         {
             // Only processing confirmed invoice events for now.
             return new OkResult();
@@ -75,20 +76,20 @@ public class BitPayController : Controller
         if (invoice == null)
         {
             // Request forged...?
-            _logger.LogWarning("Invoice not found. #" + model.Data.Id);
+            _logger.LogWarning("Invoice not found. #{InvoiceId}", model.Data.Id);
             return new BadRequestResult();
         }
 
-        if (invoice.Status != "confirmed" && invoice.Status != "completed")
+        if (invoice.Status != BitPayInvoiceStatus.Confirmed && invoice.Status != BitPayInvoiceStatus.Complete)
         {
-            _logger.LogWarning("Invoice status of '" + invoice.Status + "' is not acceptable. #" + invoice.Id);
+            _logger.LogWarning("Invoice status of '{InvoiceStatus}' is not acceptable. #{InvoiceId}", invoice.Status, invoice.Id);
             return new BadRequestResult();
         }
 
         if (invoice.Currency != "USD")
         {
             // Only process USD payments
-            _logger.LogWarning("Non USD payment received. #" + invoice.Id);
+            _logger.LogWarning("Non USD payment received. #{InvoiceId}", invoice.Id);
             return new OkResult();
         }
 
diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs
index 82ceb817e3..d5e815b4e7 100644
--- a/src/Core/Constants.cs
+++ b/src/Core/Constants.cs
@@ -102,7 +102,6 @@ public static class AuthenticationSchemes
 public static class FeatureFlagKeys
 {
     /* Admin Console Team */
-    public const string ProviderClientVaultPrivacyBanner = "ac-2833-provider-client-vault-privacy-banner";
     public const string AccountDeprovisioning = "pm-10308-account-deprovisioning";
     public const string VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint";
     public const string DeviceApprovalRequestAdminNotifications = "pm-15637-device-approval-request-admin-notifications";