diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp
index d56321ce69..2aaeca7fec 100644
--- a/src/xrpld/app/tx/detail/AMMClawback.cpp
+++ b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -33,12 +33,6 @@
 
 namespace ripple {
 
-bool
-AMMClawback::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureAMMClawback);
-}
-
 std::uint32_t
 AMMClawback::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/AMMClawback.h b/src/xrpld/app/tx/detail/AMMClawback.h
index 0e354ebdc7..1984937971 100644
--- a/src/xrpld/app/tx/detail/AMMClawback.h
+++ b/src/xrpld/app/tx/detail/AMMClawback.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/Batch.cpp b/src/xrpld/app/tx/detail/Batch.cpp
index a7a766d068..f81ae5d0f1 100644
--- a/src/xrpld/app/tx/detail/Batch.cpp
+++ b/src/xrpld/app/tx/detail/Batch.cpp
@@ -164,12 +164,6 @@ Batch::calculateBaseFee(ReadView const& view, STTx const& tx)
     return signerFees + txnFees + batchBase;
 }
 
-bool
-Batch::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureBatch);
-}
-
 std::uint32_t
 Batch::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/Batch.h b/src/xrpld/app/tx/detail/Batch.h
index 427cc6bf34..07863a5f33 100644
--- a/src/xrpld/app/tx/detail/Batch.h
+++ b/src/xrpld/app/tx/detail/Batch.h
@@ -40,9 +40,6 @@ public:
     static XRPAmount
     calculateBaseFee(ReadView const& view, STTx const& tx);
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/CancelCheck.cpp b/src/xrpld/app/tx/detail/CancelCheck.cpp
index 82ec1bbd1e..598e8bf720 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.cpp
+++ b/src/xrpld/app/tx/detail/CancelCheck.cpp
@@ -29,12 +29,6 @@
 
 namespace ripple {
 
-bool
-CancelCheck::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureChecks);
-}
-
 NotTEC
 CancelCheck::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/CancelCheck.h b/src/xrpld/app/tx/detail/CancelCheck.h
index 44cf3e0721..d9b70f919c 100644
--- a/src/xrpld/app/tx/detail/CancelCheck.h
+++ b/src/xrpld/app/tx/detail/CancelCheck.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/CashCheck.cpp b/src/xrpld/app/tx/detail/CashCheck.cpp
index 7768db31c9..f8ab6189a3 100644
--- a/src/xrpld/app/tx/detail/CashCheck.cpp
+++ b/src/xrpld/app/tx/detail/CashCheck.cpp
@@ -32,12 +32,6 @@
 
 namespace ripple {
 
-bool
-CashCheck::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureChecks);
-}
-
 NotTEC
 CashCheck::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/CashCheck.h b/src/xrpld/app/tx/detail/CashCheck.h
index cc3d564efe..da7ef22e3c 100644
--- a/src/xrpld/app/tx/detail/CashCheck.h
+++ b/src/xrpld/app/tx/detail/CashCheck.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/Clawback.cpp b/src/xrpld/app/tx/detail/Clawback.cpp
index 012565ad95..f417c71bb8 100644
--- a/src/xrpld/app/tx/detail/Clawback.cpp
+++ b/src/xrpld/app/tx/detail/Clawback.cpp
@@ -75,12 +75,6 @@ preflightHelper<MPTIssue>(PreflightContext const& ctx)
     return tesSUCCESS;
 }
 
-bool
-Clawback::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureClawback);
-}
-
 std::uint32_t
 Clawback::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/Clawback.h b/src/xrpld/app/tx/detail/Clawback.h
index 8300d98fde..b02233c2ed 100644
--- a/src/xrpld/app/tx/detail/Clawback.h
+++ b/src/xrpld/app/tx/detail/Clawback.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/CreateCheck.cpp b/src/xrpld/app/tx/detail/CreateCheck.cpp
index a8ebce4204..8b2b119577 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.cpp
+++ b/src/xrpld/app/tx/detail/CreateCheck.cpp
@@ -28,12 +28,6 @@
 
 namespace ripple {
 
-bool
-CreateCheck::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureChecks);
-}
-
 NotTEC
 CreateCheck::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/CreateCheck.h b/src/xrpld/app/tx/detail/CreateCheck.h
index 1d9a7ce168..0e414ce012 100644
--- a/src/xrpld/app/tx/detail/CreateCheck.h
+++ b/src/xrpld/app/tx/detail/CreateCheck.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/CreateTicket.cpp b/src/xrpld/app/tx/detail/CreateTicket.cpp
index 8d88dd7bf8..d48da2d780 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.cpp
+++ b/src/xrpld/app/tx/detail/CreateTicket.cpp
@@ -33,12 +33,6 @@ CreateTicket::makeTxConsequences(PreflightContext const& ctx)
     return TxConsequences{ctx.tx, ctx.tx[sfTicketCount]};
 }
 
-bool
-CreateTicket::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureTicketBatch);
-}
-
 NotTEC
 CreateTicket::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/CreateTicket.h b/src/xrpld/app/tx/detail/CreateTicket.h
index 04ad6711c7..86cf91bb5a 100644
--- a/src/xrpld/app/tx/detail/CreateTicket.h
+++ b/src/xrpld/app/tx/detail/CreateTicket.h
@@ -69,9 +69,6 @@ public:
     static TxConsequences
     makeTxConsequences(PreflightContext const& ctx);
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     /** Enforce constraints beyond those of the Transactor base class. */
     static NotTEC
     preflight(PreflightContext const& ctx);
diff --git a/src/xrpld/app/tx/detail/Credentials.cpp b/src/xrpld/app/tx/detail/Credentials.cpp
index abd5539100..8661b8ab16 100644
--- a/src/xrpld/app/tx/detail/Credentials.cpp
+++ b/src/xrpld/app/tx/detail/Credentials.cpp
@@ -48,12 +48,6 @@ using namespace credentials;
 
 // ------- CREATE --------------------------
 
-bool
-CredentialCreate::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureCredentials);
-}
-
 std::uint32_t
 CredentialCreate::getFlagsMask(PreflightContext const& ctx)
 {
@@ -199,11 +193,6 @@ CredentialCreate::doApply()
 }
 
 // ------- DELETE --------------------------
-bool
-CredentialDelete::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureCredentials);
-}
 
 std::uint32_t
 CredentialDelete::getFlagsMask(PreflightContext const& ctx)
@@ -283,12 +272,6 @@ CredentialDelete::doApply()
 
 // ------- APPLY --------------------------
 
-bool
-CredentialAccept::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureCredentials);
-}
-
 std::uint32_t
 CredentialAccept::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/Credentials.h b/src/xrpld/app/tx/detail/Credentials.h
index 31b1ee8cf7..a5885a2226 100644
--- a/src/xrpld/app/tx/detail/Credentials.h
+++ b/src/xrpld/app/tx/detail/Credentials.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
@@ -60,9 +57,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
@@ -87,9 +81,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/DID.cpp b/src/xrpld/app/tx/detail/DID.cpp
index 8c1e23f4d5..bcbd65d919 100644
--- a/src/xrpld/app/tx/detail/DID.cpp
+++ b/src/xrpld/app/tx/detail/DID.cpp
@@ -42,12 +42,6 @@ namespace ripple {
 
 //------------------------------------------------------------------------------
 
-bool
-DIDSet::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureDID);
-}
-
 NotTEC
 DIDSet::preflight(PreflightContext const& ctx)
 {
@@ -168,12 +162,6 @@ DIDSet::doApply()
     return addSLE(ctx_, sleDID, account_);
 }
 
-bool
-DIDDelete::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureDID);
-}
-
 NotTEC
 DIDDelete::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/DID.h b/src/xrpld/app/tx/detail/DID.h
index c9fbb199b9..54ae6630f2 100644
--- a/src/xrpld/app/tx/detail/DID.h
+++ b/src/xrpld/app/tx/detail/DID.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
@@ -54,9 +51,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/DelegateSet.cpp b/src/xrpld/app/tx/detail/DelegateSet.cpp
index 7119c9ac27..50fdfedbc7 100644
--- a/src/xrpld/app/tx/detail/DelegateSet.cpp
+++ b/src/xrpld/app/tx/detail/DelegateSet.cpp
@@ -27,12 +27,6 @@
 
 namespace ripple {
 
-bool
-DelegateSet::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featurePermissionDelegation);
-}
-
 NotTEC
 DelegateSet::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/DelegateSet.h b/src/xrpld/app/tx/detail/DelegateSet.h
index c95b0f8fd4..c72b1e3c58 100644
--- a/src/xrpld/app/tx/detail/DelegateSet.h
+++ b/src/xrpld/app/tx/detail/DelegateSet.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.cpp b/src/xrpld/app/tx/detail/DeleteOracle.cpp
index ac078e5c9d..5831bddb93 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.cpp
+++ b/src/xrpld/app/tx/detail/DeleteOracle.cpp
@@ -26,12 +26,6 @@
 
 namespace ripple {
 
-bool
-DeleteOracle::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featurePriceOracle);
-}
-
 NotTEC
 DeleteOracle::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/DeleteOracle.h b/src/xrpld/app/tx/detail/DeleteOracle.h
index f55b5d0f50..bbbfc6f525 100644
--- a/src/xrpld/app/tx/detail/DeleteOracle.h
+++ b/src/xrpld/app/tx/detail/DeleteOracle.h
@@ -42,9 +42,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/DepositPreauth.cpp b/src/xrpld/app/tx/detail/DepositPreauth.cpp
index 3d1cbf7381..4e7df27210 100644
--- a/src/xrpld/app/tx/detail/DepositPreauth.cpp
+++ b/src/xrpld/app/tx/detail/DepositPreauth.cpp
@@ -33,9 +33,6 @@ namespace ripple {
 bool
 DepositPreauth::isEnabled(PreflightContext const& ctx)
 {
-    if (!ctx.rules.enabled(featureDepositPreauth))
-        return false;
-
     bool const authArrPresent = ctx.tx.isFieldPresent(sfAuthorizeCredentials);
     bool const unauthArrPresent =
         ctx.tx.isFieldPresent(sfUnauthorizeCredentials);
diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.cpp b/src/xrpld/app/tx/detail/LedgerStateFix.cpp
index eeb67bbc91..d20eeca011 100644
--- a/src/xrpld/app/tx/detail/LedgerStateFix.cpp
+++ b/src/xrpld/app/tx/detail/LedgerStateFix.cpp
@@ -27,12 +27,6 @@
 
 namespace ripple {
 
-bool
-LedgerStateFix::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(fixNFTokenPageLinks);
-}
-
 NotTEC
 LedgerStateFix::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/LedgerStateFix.h b/src/xrpld/app/tx/detail/LedgerStateFix.h
index b93dcd6a00..bff51a723c 100644
--- a/src/xrpld/app/tx/detail/LedgerStateFix.h
+++ b/src/xrpld/app/tx/detail/LedgerStateFix.h
@@ -37,9 +37,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
index 521b81944e..351462c445 100644
--- a/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.cpp
@@ -26,12 +26,6 @@
 
 namespace ripple {
 
-bool
-MPTokenAuthorize::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureMPTokensV1);
-}
-
 std::uint32_t
 MPTokenAuthorize::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/MPTokenAuthorize.h b/src/xrpld/app/tx/detail/MPTokenAuthorize.h
index 60419e1827..43a962e24e 100644
--- a/src/xrpld/app/tx/detail/MPTokenAuthorize.h
+++ b/src/xrpld/app/tx/detail/MPTokenAuthorize.h
@@ -42,9 +42,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
index 8ca1294dcc..18e2d219b9 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceCreate.cpp
@@ -28,9 +28,6 @@ namespace ripple {
 bool
 MPTokenIssuanceCreate::isEnabled(PreflightContext const& ctx)
 {
-    if (!ctx.rules.enabled(featureMPTokensV1))
-        return false;
-
     if (ctx.tx.isFieldPresent(sfDomainID) &&
         !(ctx.rules.enabled(featurePermissionedDomains) &&
           ctx.rules.enabled(featureSingleAssetVault)))
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
index d52dcca8bf..2f6c8e24db 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.cpp
@@ -25,12 +25,6 @@
 
 namespace ripple {
 
-bool
-MPTokenIssuanceDestroy::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureMPTokensV1);
-}
-
 std::uint32_t
 MPTokenIssuanceDestroy::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h
index dd2131713b..2cebdb7352 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceDestroy.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
index d74e3dccb6..e54767ffdd 100644
--- a/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
+++ b/src/xrpld/app/tx/detail/MPTokenIssuanceSet.cpp
@@ -29,9 +29,6 @@ namespace ripple {
 bool
 MPTokenIssuanceSet::isEnabled(PreflightContext const& ctx)
 {
-    if (!ctx.rules.enabled(featureMPTokensV1))
-        return false;
-
     return !ctx.tx.isFieldPresent(sfDomainID) ||
         (ctx.rules.enabled(featurePermissionedDomains) &&
          ctx.rules.enabled(featureSingleAssetVault));
diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
index 6cb8e89c40..4d88288a12 100644
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.cpp
@@ -27,12 +27,6 @@
 
 namespace ripple {
 
-bool
-NFTokenAcceptOffer::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureNonFungibleTokensV1);
-}
-
 std::uint32_t
 NFTokenAcceptOffer::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
index b049aad46e..995581d1ff 100644
--- a/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenAcceptOffer.h
@@ -51,9 +51,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.cpp b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
index 80aec56af6..cb1b564402 100644
--- a/src/xrpld/app/tx/detail/NFTokenBurn.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.cpp
@@ -26,12 +26,6 @@
 
 namespace ripple {
 
-bool
-NFTokenBurn::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureNonFungibleTokensV1);
-}
-
 NotTEC
 NFTokenBurn::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/NFTokenBurn.h b/src/xrpld/app/tx/detail/NFTokenBurn.h
index f1ae0752db..3f5296c217 100644
--- a/src/xrpld/app/tx/detail/NFTokenBurn.h
+++ b/src/xrpld/app/tx/detail/NFTokenBurn.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
index 66edddcc82..92a4d2f4dc 100644
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.cpp
@@ -28,12 +28,6 @@
 
 namespace ripple {
 
-bool
-NFTokenCancelOffer::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureNonFungibleTokensV1);
-}
-
 std::uint32_t
 NFTokenCancelOffer::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
index bdd628e58d..b35be0e757 100644
--- a/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCancelOffer.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
index 76ebc9e24d..9e6b0fadcb 100644
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.cpp
@@ -26,12 +26,6 @@
 
 namespace ripple {
 
-bool
-NFTokenCreateOffer::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featureNonFungibleTokensV1);
-}
-
 std::uint32_t
 NFTokenCreateOffer::getFlagsMask(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
index 58946bad55..0a1c631298 100644
--- a/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
+++ b/src/xrpld/app/tx/detail/NFTokenCreateOffer.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static std::uint32_t
     getFlagsMask(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/NFTokenMint.cpp b/src/xrpld/app/tx/detail/NFTokenMint.cpp
index db49e122e2..98f7a75627 100644
--- a/src/xrpld/app/tx/detail/NFTokenMint.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenMint.cpp
@@ -49,9 +49,6 @@ hasOfferFields(PreflightContext const& ctx)
 bool
 NFTokenMint::isEnabled(PreflightContext const& ctx)
 {
-    if (!ctx.rules.enabled(featureNonFungibleTokensV1))
-        return false;
-
     return ctx.rules.enabled(featureNFTokenMintOffer) || !hasOfferFields(ctx);
 }
 
diff --git a/src/xrpld/app/tx/detail/NFTokenModify.cpp b/src/xrpld/app/tx/detail/NFTokenModify.cpp
index 98cbd5760a..2a1a348187 100644
--- a/src/xrpld/app/tx/detail/NFTokenModify.cpp
+++ b/src/xrpld/app/tx/detail/NFTokenModify.cpp
@@ -28,8 +28,7 @@ namespace ripple {
 bool
 NFTokenModify::isEnabled(PreflightContext const& ctx)
 {
-    return ctx.rules.enabled(featureNonFungibleTokensV1_1) &&
-        ctx.rules.enabled(featureDynamicNFT);
+    return ctx.rules.enabled(featureNonFungibleTokensV1_1);
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
index 6087bae8ad..5d5828c9c9 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainDelete.cpp
@@ -24,12 +24,6 @@
 
 namespace ripple {
 
-bool
-PermissionedDomainDelete::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featurePermissionedDomains);
-}
-
 NotTEC
 PermissionedDomainDelete::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h b/src/xrpld/app/tx/detail/PermissionedDomainDelete.h
index 403d0786e3..8b5fa68e59 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainDelete.h
+++ b/src/xrpld/app/tx/detail/PermissionedDomainDelete.h
@@ -33,9 +33,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
index 8e27fdddd6..755772c244 100644
--- a/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
+++ b/src/xrpld/app/tx/detail/PermissionedDomainSet.cpp
@@ -31,8 +31,7 @@ namespace ripple {
 bool
 PermissionedDomainSet::isEnabled(PreflightContext const& ctx)
 {
-    return ctx.rules.enabled(featurePermissionedDomains) &&
-        ctx.rules.enabled(featureCredentials);
+    return ctx.rules.enabled(featureCredentials);
 }
 
 NotTEC
diff --git a/src/xrpld/app/tx/detail/SetOracle.cpp b/src/xrpld/app/tx/detail/SetOracle.cpp
index 98c4530fba..2bdbb7cf6a 100644
--- a/src/xrpld/app/tx/detail/SetOracle.cpp
+++ b/src/xrpld/app/tx/detail/SetOracle.cpp
@@ -36,12 +36,6 @@ tokenPairKey(STObject const& pair)
         pair.getFieldCurrency(sfQuoteAsset).currency());
 }
 
-bool
-SetOracle::isEnabled(PreflightContext const& ctx)
-{
-    return ctx.rules.enabled(featurePriceOracle);
-}
-
 NotTEC
 SetOracle::preflight(PreflightContext const& ctx)
 {
diff --git a/src/xrpld/app/tx/detail/SetOracle.h b/src/xrpld/app/tx/detail/SetOracle.h
index 2da10105b2..656b656019 100644
--- a/src/xrpld/app/tx/detail/SetOracle.h
+++ b/src/xrpld/app/tx/detail/SetOracle.h
@@ -42,9 +42,6 @@ public:
     {
     }
 
-    static bool
-    isEnabled(PreflightContext const& ctx);
-
     static NotTEC
     preflight(PreflightContext const& ctx);
 
diff --git a/src/xrpld/app/tx/detail/Transactor.h b/src/xrpld/app/tx/detail/Transactor.h
index 9b5638d9e1..939b23cf93 100644
--- a/src/xrpld/app/tx/detail/Transactor.h
+++ b/src/xrpld/app/tx/detail/Transactor.h
@@ -203,7 +203,8 @@ public:
     /* Do NOT define an invokePreflight function in a derived class.
        Instead, define:
 
-        // Optional if the transaction is gated on an amendment
+        // Optional if the transaction is gated on an amendment that
+        // isn't specified in transactions.macro
         static bool
         isEnabled(PreflightContext const& ctx);
 
@@ -389,10 +390,6 @@ template <class T>
 NotTEC
 Transactor::invokePreflight(PreflightContext const& ctx)
 {
-    // TODO: If #5650 is merged, use its transaction -> amendment lookup here to
-    // do a first-pass check. Rewrite or remove any `isEnabled` overloads that
-    // check those default amendments.
-
     // Using this lookup does NOT require checking the fixDelegateV1_1. The data
     // exists regardless of whether it is enabled.
     auto const feature =