diff --git a/src/ripple/protocol/Feature.h b/src/ripple/protocol/Feature.h
index 045043f9df0..eb799042752 100644
--- a/src/ripple/protocol/Feature.h
+++ b/src/ripple/protocol/Feature.h
@@ -365,23 +365,11 @@ foreachFeature(FeatureBitset bs, F&& f)
 
 extern uint256 const featureTickets;
 extern uint256 const featureOwnerPaysFee;
-extern uint256 const retiredPayChan;
 extern uint256 const featureFlow;
 extern uint256 const featureCompareTakerFlowCross;
 extern uint256 const featureFlowCross;
-extern uint256 const retiredCryptoConditions;
-extern uint256 const retiredTickSize;
-extern uint256 const retiredFix1368;
-extern uint256 const retiredEscrow;
 extern uint256 const featureCryptoConditionsSuite;
-extern uint256 const retiredFix1373;
-extern uint256 const retiredEnforceInvariants;
-extern uint256 const retiredSortedDirectories;
-extern uint256 const retiredFix1201;
-extern uint256 const retiredFix1512;
 extern uint256 const fix1513;
-extern uint256 const retiredFix1523;
-extern uint256 const retiredFix1528;
 extern uint256 const featureDepositAuth;
 extern uint256 const featureChecks;
 extern uint256 const fix1571;
@@ -400,6 +388,21 @@ extern uint256 const fixQualityUpperBound;
 extern uint256 const fix1781;
 extern uint256 const featureRequireFullyCanonicalSig;
 
+// The following amendments have been active for at least two years.
+// Their pre-amendment code has been removed.
+extern uint256 const retiredPayChan;
+extern uint256 const retiredCryptoConditions;
+extern uint256 const retiredTickSize;
+extern uint256 const retiredFix1368;
+extern uint256 const retiredEscrow;
+extern uint256 const retiredFix1373;
+extern uint256 const retiredEnforceInvariants;
+extern uint256 const retiredSortedDirectories;
+extern uint256 const retiredFix1201;
+extern uint256 const retiredFix1512;
+extern uint256 const retiredFix1523;
+extern uint256 const retiredFix1528;
+
 } // ripple
 
 #endif
diff --git a/src/ripple/protocol/impl/Feature.cpp b/src/ripple/protocol/impl/Feature.cpp
index f79dfaa550c..30484bbf759 100644
--- a/src/ripple/protocol/impl/Feature.cpp
+++ b/src/ripple/protocol/impl/Feature.cpp
@@ -156,23 +156,11 @@ uint256 bitsetIndexToFeature(size_t i)
 
 uint256 const featureTickets = *getRegisteredFeature("Tickets");
 uint256 const featureOwnerPaysFee = *getRegisteredFeature("OwnerPaysFee");
-uint256 const retiredPayChan = *getRegisteredFeature("PayChan");
 uint256 const featureFlow = *getRegisteredFeature("Flow");
 uint256 const featureCompareTakerFlowCross = *getRegisteredFeature("CompareTakerFlowCross");
 uint256 const featureFlowCross = *getRegisteredFeature("FlowCross");
-uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
-uint256 const retiredTickSize = *getRegisteredFeature("TickSize");
-uint256 const retiredFix1368 = *getRegisteredFeature("fix1368");
-uint256 const retiredEscrow = *getRegisteredFeature("Escrow");
 uint256 const featureCryptoConditionsSuite = *getRegisteredFeature("CryptoConditionsSuite");
-uint256 const retiredFix1373 = *getRegisteredFeature("fix1373");
-uint256 const retiredEnforceInvariants = *getRegisteredFeature("EnforceInvariants");
-uint256 const retiredSortedDirectories = *getRegisteredFeature("SortedDirectories");
-uint256 const retiredFix1201 = *getRegisteredFeature("fix1201");
-uint256 const retiredFix1512 = *getRegisteredFeature("fix1512");
 uint256 const fix1513 = *getRegisteredFeature("fix1513");
-uint256 const retiredFix1523 = *getRegisteredFeature("fix1523");
-uint256 const retiredFix1528 = *getRegisteredFeature("fix1528");
 uint256 const featureDepositAuth = *getRegisteredFeature("DepositAuth");
 uint256 const featureChecks = *getRegisteredFeature("Checks");
 uint256 const fix1571 = *getRegisteredFeature("fix1571");
@@ -191,4 +179,19 @@ uint256 const fixQualityUpperBound = *getRegisteredFeature("fixQualityUpperBound
 uint256 const fix1781 = *getRegisteredFeature("fix1781");
 uint256 const featureRequireFullyCanonicalSig = *getRegisteredFeature("RequireFullyCanonicalSig");
 
+// The following amendments have been active for at least two years.
+// Their pre-amendment code has been removed.
+uint256 const retiredPayChan = *getRegisteredFeature("PayChan");
+uint256 const retiredCryptoConditions = *getRegisteredFeature("CryptoConditions");
+uint256 const retiredTickSize = *getRegisteredFeature("TickSize");
+uint256 const retiredFix1368 = *getRegisteredFeature("fix1368");
+uint256 const retiredEscrow = *getRegisteredFeature("Escrow");
+uint256 const retiredFix1373 = *getRegisteredFeature("fix1373");
+uint256 const retiredEnforceInvariants = *getRegisteredFeature("EnforceInvariants");
+uint256 const retiredSortedDirectories = *getRegisteredFeature("SortedDirectories");
+uint256 const retiredFix1201 = *getRegisteredFeature("fix1201");
+uint256 const retiredFix1512 = *getRegisteredFeature("fix1512");
+uint256 const retiredFix1523 = *getRegisteredFeature("fix1523");
+uint256 const retiredFix1528 = *getRegisteredFeature("fix1528");
+
 } // ripple