diff --git a/Android.bp b/Android.bp
index 045a9638486..b456a72170a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,7 +75,6 @@ android_library {
         "android.hardware.dumpstate-V1-java",
         "android.hardware.dumpstate-V1.0-java",
         "android.hardware.dumpstate-V1.1-java",
-        "android.nfc.flags-aconfig-java",
         "android.view.accessibility.flags-aconfig-java",
         "com_android_server_accessibility_flags_lib",
         "net-utils-framework-common",
diff --git a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
index e378eb3ca74..b95da8070b2 100644
--- a/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
+++ b/src/com/android/settings/applications/specialaccess/PaymentSettingsEnabler.java
@@ -17,7 +17,6 @@
 package com.android.settings.applications.specialaccess;
 
 import android.content.Context;
-import android.nfc.Flags;
 import android.nfc.NfcAdapter;
 import android.nfc.cardemulation.CardEmulation;
 import android.os.UserHandle;
@@ -67,12 +66,8 @@ public class PaymentSettingsEnabler extends BaseNfcEnabler {
     }
 
     private boolean hasAnyServices() {
-        if (Flags.enableNfcMainline()) {
-            return mCardEmuManager.getServices(
-                CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
-        } else {
-            return mCardEmuManager.getServices(CardEmulation.CATEGORY_PAYMENT).isEmpty();
-        }
+        return mCardEmuManager.getServices(
+            CardEmulation.CATEGORY_PAYMENT, UserHandle.myUserId()).isEmpty();
     }
 
     @Override