diff --git a/docs/threat_models/README.md b/docs/threat_models/README.md
index 95172e7eda9..ed4abe2804c 100644
--- a/docs/threat_models/README.md
+++ b/docs/threat_models/README.md
@@ -7,26 +7,6 @@
 
 [![./pegasus/pegasus_sequence.svg](./pegasus/pegasus_sequence.svg)](./pegasus/pegasus_sequence.svg)
 
-## ./smart_contracts/amm/amm_component.svg
-
-[![./smart_contracts/amm/amm_component.svg](./smart_contracts/amm/amm_component.svg)](./smart_contracts/amm/amm_component.svg)
-
-## ./smart_contracts/amm/amm_sequence.svg
-
-[![./smart_contracts/amm/amm_sequence.svg](./smart_contracts/amm/amm_sequence.svg)](./smart_contracts/amm/amm_sequence.svg)
-
-## ./smart_contracts/amm/amm_sequence_001.svg
-
-[![./smart_contracts/amm/amm_sequence_001.svg](./smart_contracts/amm/amm_sequence_001.svg)](./smart_contracts/amm/amm_sequence_001.svg)
-
-## ./smart_contracts/amm/amm_sequence_002.svg
-
-[![./smart_contracts/amm/amm_sequence_002.svg](./smart_contracts/amm/amm_sequence_002.svg)](./smart_contracts/amm/amm_sequence_002.svg)
-
-## ./smart_contracts/amm/amm_sequence_003.svg
-
-[![./smart_contracts/amm/amm_sequence_003.svg](./smart_contracts/amm/amm_sequence_003.svg)](./smart_contracts/amm/amm_sequence_003.svg)
-
 ## ./vaultFactory/VaultFactory.svg
 
 [![./vaultFactory/VaultFactory.svg](./vaultFactory/VaultFactory.svg)](./vaultFactory/VaultFactory.svg)
diff --git a/docs/threat_models/vaultFactory/VaultFactory.svg b/docs/threat_models/vaultFactory/VaultFactory.svg
index 6402002b260..5a1dfdd1825 100644
--- a/docs/threat_models/vaultFactory/VaultFactory.svg
+++ b/docs/threat_models/vaultFactory/VaultFactory.svg
@@ -1,35 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="721px" preserveAspectRatio="none" style="width:1851px;height:721px;background:#FFFFFF;" version="1.1" viewBox="0 0 1851 721" width="1851px" zoomAndPan="magnify"><defs><filter height="300%" id="fg724krouinqn" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="176" x="1662.5" y="9.668">Agoric Systems Operating Company.</text><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="108" x="865.25" y="29.1797">VaultFactory</text><!--MD5=[8a2eb637b9b19418d84b8f66e74da74e]
-cluster Vat--><polygon fill="#FFFFFF" filter="url(#fg724krouinqn)" points="944.5,191.4766,954.5,181.4766,1834.5,181.4766,1834.5,687.4766,1824.5,697.4766,944.5,697.4766,944.5,191.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1824.5" x2="1834.5" y1="191.4766" y2="181.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="944.5" x2="1824.5" y1="191.4766" y2="191.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1824.5" x2="1824.5" y1="191.4766" y2="697.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="24" x="1373.5" y="208.0117">Vat</text><!--MD5=[f8bdb8f2d8c9b7e2f062dc65a90a6e92]
-cluster VaultFactory--><polygon fill="#FFFFFF" filter="url(#fg724krouinqn)" points="968.5,239.4766,978.5,229.4766,1671.5,229.4766,1671.5,429.4766,1661.5,439.4766,968.5,439.4766,968.5,239.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1661.5" x2="1671.5" y1="239.4766" y2="229.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="968.5" x2="1661.5" y1="239.4766" y2="239.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1661.5" x2="1661.5" y1="239.4766" y2="439.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="90" x="1271" y="256.0117">VaultFactory</text><!--MD5=[99c8f1fa4cdca03c066c3375012f7136]
-cluster publicAPI--><polygon fill="#FFFFFF" filter="url(#fg724krouinqn)" points="1311.5,287.4766,1321.5,277.4766,1647.5,277.4766,1647.5,405.4766,1637.5,415.4766,1311.5,415.4766,1311.5,287.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1637.5" x2="1647.5" y1="287.4766" y2="277.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1311.5" x2="1637.5" y1="287.4766" y2="287.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1637.5" x2="1637.5" y1="287.4766" y2="415.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="68" x="1441.5" y="304.0117">publicAPI</text><!--MD5=[232cf8ad5512aba8c39088a343f64591]
-cluster creatorFacet--><polygon fill="#FFFFFF" filter="url(#fg724krouinqn)" points="1077.5,287.4766,1087.5,277.4766,1287.5,277.4766,1287.5,405.4766,1277.5,415.4766,1077.5,415.4766,1077.5,287.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1277.5" x2="1287.5" y1="287.4766" y2="277.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1077.5" x2="1277.5" y1="287.4766" y2="287.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1277.5" x2="1277.5" y1="287.4766" y2="415.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="87" x="1135" y="304.0117">creatorFacet</text><!--MD5=[417cef51afa734c49601c72371d80e99]
-cluster Vault--><polygon fill="#FFFFFF" filter="url(#fg724krouinqn)" points="976.5,521.4766,986.5,511.4766,1802.5,511.4766,1802.5,655.4766,1792.5,665.4766,976.5,665.4766,976.5,521.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1792.5" x2="1802.5" y1="521.4766" y2="511.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="976.5" x2="1792.5" y1="521.4766" y2="521.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1792.5" x2="1792.5" y1="521.4766" y2="665.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="1366.5" y="538.0117">Vault</text><!--MD5=[d26da07a3bd7c17143f45609ee6234d1]
-entity AMM--><polygon fill="#FEFECE" filter="url(#fg724krouinqn)" points="984.5,357.4766,994.5,347.4766,1058.5,347.4766,1058.5,383.9648,1048.5,393.9648,984.5,393.9648,984.5,357.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1048.5" x2="1058.5" y1="357.4766" y2="347.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="984.5" x2="1048.5" y1="357.4766" y2="357.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1048.5" x2="1048.5" y1="357.4766" y2="393.9648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34" x="999.5" y="381.0117">AMM</text><!--MD5=[66ceb15796fb2bf373585fde39c5b4b3]
-entity getCollaterals--><ellipse cx="1523.5" cy="370.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="1476" y="401.0117">getCollaterals</text><!--MD5=[64e5de53d0c9ddfcd2eb1d28e3b35bc4]
-entity makeVaultInvitation--><ellipse cx="1622.5" cy="370.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136" x="1554.5" y="401.0117">makeVaultInvitation</text><!--MD5=[1fb612ddb12759a773b01c69ccf6be01]
-entity getRunIssuer--><ellipse cx="1380.5" cy="370.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="90" x="1335.5" y="401.0117">getRunIssuer</text><!--MD5=[4d0b1c11acb7b86ed7d724b6216c6d31]
-entity makeAddTypeInvitation--><ellipse cx="1182.5" cy="370.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="1101.5" y="401.0117">makeAddTypeInvitation</text><!--MD5=[06c0c19eef2d500ef65e114e6cfb9915]
-entity makeCloseInvitation--><ellipse cx="1077.5" cy="612.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="1008" y="643.0117">makeCloseInvitation</text><!--MD5=[c0fbfa0b94e356be92dac6d7ef4e2fb7]
-entity makeAdjustBalancesInvitation--><ellipse cx="1649.5" cy="612.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="1547.5" y="643.0117">makeAdjustBalancesInvitation</text><!--MD5=[696aa05efa7cd6a86e7ac2f866034347]
-entity getCollateralAmount--><ellipse cx="1425.5" cy="612.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="1354" y="643.0117">getCollateralAmount</text><!--MD5=[ff92a3d63f46ed95f314d84227ca4160]
-entity getCurrentDebt--><ellipse cx="1250.5" cy="612.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="1197" y="643.0117">getCurrentDebt</text><!--MD5=[acae44d39ee77ba2e78b684f68d8ffa5]
-entity vfc--><ellipse cx="1182.5" cy="46.9766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M1182.5,54.9766 L1182.5,81.9766 M1169.5,62.9766 L1195.5,62.9766 M1182.5,81.9766 L1169.5,96.9766 M1182.5,81.9766 L1195.5,96.9766 " fill="none" filter="url(#fg724krouinqn)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="250" x="1057.5" y="116.0117">VaultFactoryCreator aka Governance</text><!--MD5=[4a215cce9e0f6d625b32e900af2559df]
-entity Borrower--><ellipse cx="417.5" cy="339.4766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M417.5,347.4766 L417.5,374.4766 M404.5,355.4766 L430.5,355.4766 M417.5,374.4766 L404.5,389.4766 M417.5,374.4766 L430.5,389.4766 " fill="none" filter="url(#fg724krouinqn)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="386" y="408.5117">Borrower</text><!--MD5=[9a500c87b274ebb92425a1f4d4eb730a]
-entity AdjustBalancesInvitation--><polygon fill="#FEFECE" filter="url(#fg724krouinqn)" points="721,357.4766,731,347.4766,928,347.4766,928,383.9648,918,393.9648,721,393.9648,721,357.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="918" x2="928" y1="357.4766" y2="347.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="721" x2="918" y1="357.4766" y2="357.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="918" x2="918" y1="357.4766" y2="393.9648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="736" y="381.0117">AdjustBalancesInvitation</text><!--MD5=[01ad0ee252b2307e7dd894e3b8dd3365]
-entity CloseVaultInvitation--><polygon fill="#FEFECE" filter="url(#fg724krouinqn)" points="16,357.4766,26,347.4766,193,347.4766,193,383.9648,183,393.9648,16,393.9648,16,357.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="183" x2="193" y1="357.4766" y2="347.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="183" y1="357.4766" y2="357.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="183" x2="183" y1="357.4766" y2="393.9648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="31" y="381.0117">CloseVaultInvitation</text><!--MD5=[1baf3b7099ab4ff20c5603dcac8b5085]
-entity getPayout--><ellipse cx="505.5" cy="46.9766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M505.5,54.9766 L505.5,81.9766 M492.5,62.9766 L518.5,62.9766 M505.5,81.9766 L492.5,96.9766 M505.5,81.9766 L518.5,96.9766 " fill="none" filter="url(#fg724krouinqn)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="471.5" y="116.0117">getPayout</text><!--MD5=[ee0ce818ad4ee855520210f05cc8901d]
-entity getPayouts--><ellipse cx="329.5" cy="46.9766" fill="#FEFECE" filter="url(#fg724krouinqn)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M329.5,54.9766 L329.5,81.9766 M316.5,62.9766 L342.5,62.9766 M329.5,81.9766 L316.5,96.9766 M329.5,81.9766 L342.5,96.9766 " fill="none" filter="url(#fg724krouinqn)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="292" y="116.0117">getPayouts</text><!--MD5=[a74b86729a2d12db274258c4e28f5cbd]
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="721px" preserveAspectRatio="none" style="width:1851px;height:721px;background:#FFFFFF;" version="1.1" viewBox="0 0 1851 721" width="1851px" zoomAndPan="magnify"><defs><filter height="300%" id="fggijf8nsucc1" width="300%" x="-1" y="-1"><feGaussianBlur result="blurOut" stdDeviation="2.0"/><feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/><feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/><feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/></filter></defs><g><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="176" x="1662.5" y="9.668">Agoric Systems Operating Company.</text><text fill="#000000" font-family="sans-serif" font-size="18" lengthAdjust="spacing" textLength="108" x="865.25" y="29.1797">VaultFactory</text><!--MD5=[8a2eb637b9b19418d84b8f66e74da74e]
+cluster Vat--><polygon fill="#FFFFFF" filter="url(#fggijf8nsucc1)" points="944.5,191.4766,954.5,181.4766,1834.5,181.4766,1834.5,687.4766,1824.5,697.4766,944.5,697.4766,944.5,191.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1824.5" x2="1834.5" y1="191.4766" y2="181.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="944.5" x2="1824.5" y1="191.4766" y2="191.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1824.5" x2="1824.5" y1="191.4766" y2="697.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="24" x="1373.5" y="208.0117">Vat</text><!--MD5=[f8bdb8f2d8c9b7e2f062dc65a90a6e92]
+cluster VaultFactory--><polygon fill="#FFFFFF" filter="url(#fggijf8nsucc1)" points="968.5,239.4766,978.5,229.4766,1586.5,229.4766,1586.5,429.4766,1576.5,439.4766,968.5,439.4766,968.5,239.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1576.5" x2="1586.5" y1="239.4766" y2="229.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="968.5" x2="1576.5" y1="239.4766" y2="239.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1576.5" x2="1576.5" y1="239.4766" y2="439.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="90" x="1228.5" y="256.0117">VaultFactory</text><!--MD5=[99c8f1fa4cdca03c066c3375012f7136]
+cluster publicAPI--><polygon fill="#FFFFFF" filter="url(#fggijf8nsucc1)" points="1226.5,287.4766,1236.5,277.4766,1562.5,277.4766,1562.5,405.4766,1552.5,415.4766,1226.5,415.4766,1226.5,287.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1552.5" x2="1562.5" y1="287.4766" y2="277.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1226.5" x2="1552.5" y1="287.4766" y2="287.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1552.5" x2="1552.5" y1="287.4766" y2="415.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="68" x="1356.5" y="304.0117">publicAPI</text><!--MD5=[232cf8ad5512aba8c39088a343f64591]
+cluster creatorFacet--><polygon fill="#FFFFFF" filter="url(#fggijf8nsucc1)" points="992.5,287.4766,1002.5,277.4766,1202.5,277.4766,1202.5,405.4766,1192.5,415.4766,992.5,415.4766,992.5,287.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1192.5" x2="1202.5" y1="287.4766" y2="277.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="992.5" x2="1192.5" y1="287.4766" y2="287.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1192.5" x2="1192.5" y1="287.4766" y2="415.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="87" x="1050" y="304.0117">creatorFacet</text><!--MD5=[417cef51afa734c49601c72371d80e99]
+cluster Vault--><polygon fill="#FFFFFF" filter="url(#fggijf8nsucc1)" points="976.5,521.4766,986.5,511.4766,1802.5,511.4766,1802.5,655.4766,1792.5,665.4766,976.5,665.4766,976.5,521.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="1792.5" x2="1802.5" y1="521.4766" y2="511.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="976.5" x2="1792.5" y1="521.4766" y2="521.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="1792.5" x2="1792.5" y1="521.4766" y2="665.4766"/><text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacing" textLength="38" x="1366.5" y="538.0117">Vault</text><!--MD5=[66ceb15796fb2bf373585fde39c5b4b3]
+entity getCollaterals--><ellipse cx="1438.5" cy="370.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="95" x="1391" y="401.0117">getCollaterals</text><!--MD5=[64e5de53d0c9ddfcd2eb1d28e3b35bc4]
+entity makeVaultInvitation--><ellipse cx="1537.5" cy="370.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="136" x="1469.5" y="401.0117">makeVaultInvitation</text><!--MD5=[1fb612ddb12759a773b01c69ccf6be01]
+entity getRunIssuer--><ellipse cx="1295.5" cy="370.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="90" x="1250.5" y="401.0117">getRunIssuer</text><!--MD5=[4d0b1c11acb7b86ed7d724b6216c6d31]
+entity makeAddTypeInvitation--><ellipse cx="1097.5" cy="370.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="1016.5" y="401.0117">makeAddTypeInvitation</text><!--MD5=[06c0c19eef2d500ef65e114e6cfb9915]
+entity makeCloseInvitation--><ellipse cx="1077.5" cy="612.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="139" x="1008" y="643.0117">makeCloseInvitation</text><!--MD5=[c0fbfa0b94e356be92dac6d7ef4e2fb7]
+entity makeAdjustBalancesInvitation--><ellipse cx="1649.5" cy="612.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="204" x="1547.5" y="643.0117">makeAdjustBalancesInvitation</text><!--MD5=[696aa05efa7cd6a86e7ac2f866034347]
+entity getCollateralAmount--><ellipse cx="1425.5" cy="612.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="143" x="1354" y="643.0117">getCollateralAmount</text><!--MD5=[ff92a3d63f46ed95f314d84227ca4160]
+entity getCurrentDebt--><ellipse cx="1250.5" cy="612.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="1197" y="643.0117">getCurrentDebt</text><!--MD5=[acae44d39ee77ba2e78b684f68d8ffa5]
+entity vfc--><ellipse cx="1097.5" cy="46.9766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M1097.5,54.9766 L1097.5,81.9766 M1084.5,62.9766 L1110.5,62.9766 M1097.5,81.9766 L1084.5,96.9766 M1097.5,81.9766 L1110.5,96.9766 " fill="none" filter="url(#fggijf8nsucc1)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="250" x="972.5" y="116.0117">VaultFactoryCreator aka Governance</text><!--MD5=[4a215cce9e0f6d625b32e900af2559df]
+entity Borrower--><ellipse cx="417.5" cy="339.4766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M417.5,347.4766 L417.5,374.4766 M404.5,355.4766 L430.5,355.4766 M417.5,374.4766 L404.5,389.4766 M417.5,374.4766 L430.5,389.4766 " fill="none" filter="url(#fggijf8nsucc1)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="63" x="386" y="408.5117">Borrower</text><!--MD5=[9a500c87b274ebb92425a1f4d4eb730a]
+entity AdjustBalancesInvitation--><polygon fill="#FEFECE" filter="url(#fggijf8nsucc1)" points="721,357.4766,731,347.4766,928,347.4766,928,383.9648,918,393.9648,721,393.9648,721,357.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="918" x2="928" y1="357.4766" y2="347.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="721" x2="918" y1="357.4766" y2="357.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="918" x2="918" y1="357.4766" y2="393.9648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="167" x="736" y="381.0117">AdjustBalancesInvitation</text><!--MD5=[01ad0ee252b2307e7dd894e3b8dd3365]
+entity CloseVaultInvitation--><polygon fill="#FEFECE" filter="url(#fggijf8nsucc1)" points="16,357.4766,26,347.4766,193,347.4766,193,383.9648,183,393.9648,16,393.9648,16,357.4766" style="stroke:#000000;stroke-width:1.5;"/><line style="stroke:#000000;stroke-width:1.5;" x1="183" x2="193" y1="357.4766" y2="347.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="16" x2="183" y1="357.4766" y2="357.4766"/><line style="stroke:#000000;stroke-width:1.5;" x1="183" x2="183" y1="357.4766" y2="393.9648"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="137" x="31" y="381.0117">CloseVaultInvitation</text><!--MD5=[1baf3b7099ab4ff20c5603dcac8b5085]
+entity getPayout--><ellipse cx="505.5" cy="46.9766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M505.5,54.9766 L505.5,81.9766 M492.5,62.9766 L518.5,62.9766 M505.5,81.9766 L492.5,96.9766 M505.5,81.9766 L518.5,96.9766 " fill="none" filter="url(#fggijf8nsucc1)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="471.5" y="116.0117">getPayout</text><!--MD5=[ee0ce818ad4ee855520210f05cc8901d]
+entity getPayouts--><ellipse cx="329.5" cy="46.9766" fill="#FEFECE" filter="url(#fggijf8nsucc1)" rx="8" ry="8" style="stroke:#A80036;stroke-width:1.5;"/><path d="M329.5,54.9766 L329.5,81.9766 M316.5,62.9766 L342.5,62.9766 M329.5,81.9766 L316.5,96.9766 M329.5,81.9766 L342.5,96.9766 " fill="none" filter="url(#fggijf8nsucc1)" style="stroke:#A80036;stroke-width:1.5;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="292" y="116.0117">getPayouts</text><!--MD5=[a74b86729a2d12db274258c4e28f5cbd]
 reverse link CloseVaultInvitation to makeCloseInvitation--><path d="M182.07,394.9766 C234.51,410.5766 305.44,431.1166 368.5,447.4766 C653.44,521.3866 1007.03,596.6166 1068.26,609.5366 " fill="none" id="CloseVaultInvitation-backto-makeCloseInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="177.05,393.4866,184.5298,399.8938,181.8411,394.9167,186.8181,392.228,177.05,393.4866" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[abe2648156f00449a4cfd1b4499882f1]
-reverse link AdjustBalancesInvitation to makeAdjustBalancesInvitation--><path d="M860.61,396.3766 C888.66,414.2166 929.25,436.8966 968.5,447.4766 C1010.37,458.7666 1120.26,452.1866 1163.5,455.4766 C1323.58,467.6666 1376.28,429.1966 1522.5,495.4766 C1579.07,521.1166 1627.55,581.6666 1643.75,603.4766 " fill="none" id="AdjustBalancesInvitation-backto-makeAdjustBalancesInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="856.22,393.5566,861.6276,401.7881,860.4259,396.2604,865.9536,395.0587,856.22,393.5566" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[bb5e5679383b1b4db80082f55613ba42]
-link Borrower to makeVaultInvitation--><path d="M449.23,344.1866 C499.43,304.4866 601.93,230.9566 703.5,203.4766 C799.28,177.5566 1521.14,138.9366 1596.5,203.4766 C1641.38,241.9066 1631.74,323.1966 1625.59,356.1466 " fill="none" id="Borrower-to-makeVaultInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1624.56,361.3666,1630.2112,353.3003,1625.5186,356.4593,1622.3596,351.7667,1624.56,361.3666" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="208" x="1305.5" y="162.0449">open vault and transfer collateral</text><!--MD5=[13500cc5d99bd98bf3c905d51025dfa6]
-link makeVaultInvitation to Vault--><path d="M1631.66,375.8366 C1658.83,389.3066 1739.28,433.0866 1775.5,495.4766 C1777.1138,498.2559 1778.6009,501.1324 1779.9708,504.0834 C1780.6558,505.559 1781.3115,507.0531 1781.939,508.5632 C1782.2528,509.3182 1782.5596,510.0771 1782.8595,510.8397 C1782.9344,511.0304 1783.009,511.2212 1783.0831,511.4123 " fill="none" id="makeVaultInvitation-to-Vault" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1783.0831,511.4123,1783.558,501.5749,1781.2751,506.7507,1776.0994,504.4677,1783.0831,511.4123" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7ed7662d69d0e45c8b741b9b5141e975]
+reverse link AdjustBalancesInvitation to makeAdjustBalancesInvitation--><path d="M867.15,396.2366 C900.18,414.0266 947.7,436.7166 992.5,447.4766 C1029.49,456.3666 1125.58,452.4766 1163.5,455.4766 C1323.54,468.1266 1376.28,429.1966 1522.5,495.4766 C1579.07,521.1166 1627.55,581.6666 1643.75,603.4766 " fill="none" id="AdjustBalancesInvitation-backto-makeAdjustBalancesInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="862.38,393.6466,868.3746,401.461,866.7722,396.0358,872.1974,394.4334,862.38,393.6466" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[bb5e5679383b1b4db80082f55613ba42]
+link Borrower to makeVaultInvitation--><path d="M449.23,344.1866 C499.43,304.4866 601.93,230.9566 703.5,203.4766 C790.16,180.0266 1443.31,145.0766 1511.5,203.4766 C1556.38,241.9066 1546.74,323.1966 1540.59,356.1466 " fill="none" id="Borrower-to-makeVaultInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1539.56,361.3666,1545.2112,353.3003,1540.5186,356.4593,1537.3596,351.7667,1539.56,361.3666" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="208" x="1220.5" y="162.0449">open vault and transfer collateral</text><!--MD5=[13500cc5d99bd98bf3c905d51025dfa6]
+link makeVaultInvitation to Vault--><path d="M1546.73,373.2166 C1582.83,380.5466 1715.41,412.4366 1775.5,495.4766 C1777.3844,498.0803 1779.1088,500.8028 1780.6858,503.6195 C1781.4743,505.0278 1782.2259,506.4598 1782.9423,507.9122 C1783.3005,508.6384 1783.6499,509.3697 1783.9906,510.1058 C1784.161,510.4738 1784.3292,510.8431 1784.4953,511.2134 " fill="none" id="makeVaultInvitation-to-Vault" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1784.4953,511.2134,1784.4626,501.3646,1782.4494,506.6511,1777.1629,504.638,1784.4953,511.2134" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[7ed7662d69d0e45c8b741b9b5141e975]
 reverse link getPayout to Borrower--><path d="M491.94,123.7466 C474.88,180.0566 445.86,275.8666 429.55,329.7066 " fill="none" id="getPayout-backto-Borrower" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="493.45,118.7566,487.002,126.2012,491.9936,123.5398,494.6551,128.5314,493.45,118.7566" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="134" x="485.5" y="162.0449">retrieve any proceeds</text><!--MD5=[a78d5901bb7019ca7ace937c060c027f]
 reverse link getPayouts to Borrower--><path d="M329.95,123.8466 C330.79,137.3566 332.44,152.1366 335.5,165.4766 C349.13,224.8166 377.6,289.4066 397.14,329.6666 " fill="none" id="getPayouts-backto-Borrower" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="329.65,118.5466,326.17,127.7601,329.9352,123.5384,334.1569,127.3037,329.65,118.5466" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="134" x="336.5" y="162.0449">retrieve any proceeds</text><!--MD5=[25ffaa321309c54f77c9d82ca0136377]
 link Borrower to AdjustBalancesInvitation--><path d="M449.1,370.4766 C505.56,370.4766 626.2,370.4766 715.57,370.4766 " fill="none" id="Borrower-to-AdjustBalancesInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="720.6,370.4766,711.6,366.4766,715.6,370.4766,711.6,374.4766,720.6,370.4766" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="169" x="498.5" y="349.0449">add or remove collateral or</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="235" x="467.5" y="364.3555">increase or decrease the loan balance</text><!--MD5=[cd4ceaf28dfdd4d91383784ae4abdda2]
 reverse link CloseVaultInvitation to Borrower--><path d="M198.68,370.4766 C262.22,370.4766 342.15,370.4766 385.67,370.4766 " fill="none" id="CloseVaultInvitation-backto-Borrower" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="193.36,370.4766,202.36,374.4766,198.36,370.4766,202.36,366.4766,193.36,370.4766" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="152" x="211.5" y="349.0449">close loan and withdraw</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="151" x="214" y="364.3555">any remaining collateral</text><!--MD5=[7ac2801eae909040beeabee850d3aa8f]
-link vfc to makeAddTypeInvitation--><path d="M1182.5,118.7566 C1182.5,184.7866 1182.5,313.9066 1182.5,355.9166 " fill="none" id="vfc-to-makeAddTypeInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1182.5,361.0366,1186.5,352.0366,1182.5,356.0366,1178.5,352.0366,1182.5,361.0366" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[08b8be7f2e6deffb9fee636527697e67]
+link vfc to makeAddTypeInvitation--><path d="M1097.5,118.7566 C1097.5,184.7866 1097.5,313.9066 1097.5,355.9166 " fill="none" id="vfc-to-makeAddTypeInvitation" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1097.5,361.0366,1101.5,352.0366,1097.5,356.0366,1093.5,352.0366,1097.5,361.0366" style="stroke:#A80036;stroke-width:1.0;"/><!--MD5=[08b8be7f2e6deffb9fee636527697e67]
 link Borrower to getCurrentDebt--><path d="M449.22,380.0066 C501.96,394.1566 611.04,423.3366 703.5,447.4766 C772.76,465.5566 788.61,477.6066 859.5,487.4766 C876.73,489.8766 1157.25,487.1066 1172.5,495.4766 C1213.81,518.1566 1237.33,573.1766 1246.28,598.4166 " fill="none" id="Borrower-to-getCurrentDebt" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1247.97,603.3366,1248.8212,593.5246,1246.3418,598.6091,1241.2573,596.1297,1247.97,603.3366" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="122" x="860.5" y="476.5449">how much do I owe</text><!--MD5=[3c9fc9bb2ce9f84cc612266d1cd17400]
-link Borrower to getCollateralAmount--><path d="M449.17,382.4866 C501.39,400.0466 609.18,433.8066 703.5,447.4766 C734.74,452.0066 957.93,444.4266 987.5,455.4766 C1008.5,463.3266 1005.49,479.6466 1026.5,487.4766 C1058.06,499.2366 1299.22,480.7366 1329.5,495.4766 C1375.34,517.7866 1407.04,573.4166 1419.55,598.6566 " fill="none" id="Borrower-to-getCollateralAmount" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1421.8,603.2766,1421.4659,593.4334,1419.6155,598.779,1414.2698,596.9286,1421.8,603.2766" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="97" x="1040.5" y="469.0449">how much did I</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="127" x="1027.5" y="484.3555">deposit as collateral</text><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="29" x="904.75" y="713.1445">v0.0.1</text><!--MD5=[7105ff79760670663b0d0f2ac85c8277]
+link Borrower to getCollateralAmount--><path d="M449.17,382.4866 C501.39,400.0466 609.18,433.8066 703.5,447.4766 C734.74,452.0066 957.93,444.4266 987.5,455.4766 C1008.5,463.3266 1005.49,479.6466 1026.5,487.4766 C1058.06,499.2366 1299.22,480.7366 1329.5,495.4766 C1375.34,517.7866 1407.04,573.4166 1419.55,598.6566 " fill="none" id="Borrower-to-getCollateralAmount" style="stroke:#A80036;stroke-width:1.0;"/><polygon fill="#A80036" points="1421.8,603.2766,1421.4659,593.4334,1419.6155,598.779,1414.2698,596.9286,1421.8,603.2766" style="stroke:#A80036;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="97" x="1040.5" y="469.0449">how much did I</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="127" x="1027.5" y="484.3555">deposit as collateral</text><text fill="#888888" font-family="sans-serif" font-size="10" lengthAdjust="spacing" textLength="29" x="904.75" y="713.1445">v0.0.1</text><!--MD5=[731d255d58b8adba8b5d528935dda704]
 @startuml VaultFactory
 header Agoric Systems Operating Company.
 footer v0.0.1
@@ -48,7 +47,6 @@ node "CloseVaultInvitation"
 
 node "Vat" {
     node VaultFactory {
-        node AMM
         node "publicAPI" {
             circle getCollaterals
             circle makeVaultInvitation
@@ -79,7 +77,7 @@ Borrower -d-> getCollateralAmount: how much did I \ndeposit as collateral
 
 @enduml
 
-PlantUML version 1.2021.10(Mon Aug 30 06:43:48 PDT 2021)
+PlantUML version 1.2021.7(Sun May 23 05:40:07 PDT 2021)
 (GPL source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
diff --git a/docs/threat_models/vaultFactory/vaultFactory.puml b/docs/threat_models/vaultFactory/vaultFactory.puml
index 5adfbd8cb16..f063fc3df90 100644
--- a/docs/threat_models/vaultFactory/vaultFactory.puml
+++ b/docs/threat_models/vaultFactory/vaultFactory.puml
@@ -16,7 +16,6 @@ node "CloseVaultInvitation"
 
 node "Vat" {
     node VaultFactory {
-        node AMM
         node "publicAPI" {
             circle getCollaterals
             circle makeVaultInvitation
diff --git a/packages/SwingSet/misc-tools/measure-metering/measure.js b/packages/SwingSet/misc-tools/measure-metering/measure.js
index faac97f3168..25e19486682 100644
--- a/packages/SwingSet/misc-tools/measure-metering/measure.js
+++ b/packages/SwingSet/misc-tools/measure-metering/measure.js
@@ -3,8 +3,6 @@
 // eslint-disable-next-line import/order
 import '../../tools/prepare-test-env.js';
 
-// eslint-disable-next-line import/order
-import bundleSource from '@endo/bundle-source';
 import { xsnap } from '@agoric/xsnap';
 import * as proc from 'child_process';
 import * as os from 'os';
@@ -50,11 +48,6 @@ async function run() {
   const bootFn = new URL('measurement-bootstrap.js', import.meta.url).pathname;
   const targetFn = new URL('measurement-target.js', import.meta.url).pathname;
   const zoeFn = new URL('measurement-zoe.js', import.meta.url).pathname;
-  const autoswapFn = new URL(
-    '../../../inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js',
-    import.meta.url,
-  ).pathname;
-  const autoswapBundle = await bundleSource(autoswapFn);
   const config = {
     defaultManagerType: 'xs-worker',
     bootstrap: 'bootstrap',
@@ -139,8 +132,6 @@ async function run() {
   const zoeInstallVaultFactory = await doCounted('zoeInstallVaultFactory');
   console.log(`zoe install (vaultFactory): ${zoeInstallVaultFactory}`);
 
-  const zoeInstallAMM = await doCounted('zoeInstallBundle', [autoswapBundle]);
-  console.log(`zoe install (AMM): ${zoeInstallAMM}`);
   const zoeInstantiate = await doCounted('zoeInstantiate');
   console.log(`zoe instantiate (AMM): ${zoeInstantiate}`);
 
diff --git a/packages/casting/test/deploy.js b/packages/casting/test/deploy.js
index 23df3974788..275d2450d96 100644
--- a/packages/casting/test/deploy.js
+++ b/packages/casting/test/deploy.js
@@ -24,7 +24,6 @@ const getVaultManagerMetrics = async (homeP, { cache, lookup }) => {
 export default async (homeP, { cache, lookup, makeDefaultLeader }) => {
   // const storeKey = getStoreKeyFromCache(homeP, { cache, lookup });
   const storeKey = getVaultManagerMetrics(homeP, { cache, lookup });
-  // const storeKey = ':published.amm.metrics';
 
   console.log('storeKey', await storeKey);
 
diff --git a/packages/deployment/scripts/integration-test.sh b/packages/deployment/scripts/integration-test.sh
index a80127bf9ad..4effdfc6ea4 100755
--- a/packages/deployment/scripts/integration-test.sh
+++ b/packages/deployment/scripts/integration-test.sh
@@ -59,8 +59,7 @@ then
   SDK_BUILD=0 MUST_USE_PUBLISH_BUNDLE=1 SDK_SRC=/usr/src/agoric-sdk OUTPUT_DIR="$RESULTSDIR" ./start.sh \
     --stage.save-storage --trace kvstore swingstore xsnap \
     --stages=3 --stage.duration=10 --stage.loadgen.cycles=4 \
-    --stage.loadgen.vault.interval=12 --stage.loadgen.vault.limit=2 \
-    --stage.loadgen.amm.interval=12 --stage.loadgen.amm.wait=6 --stage.loadgen.amm.limit=2 \
+    --stage.loadgen.faucet.interval=6 --stage.loadgen.faucet.limit=4 \
     --profile=testnet "--testnet-origin=file://$RESULTSDIR" \
     --no-reset --custom-bootstrap
 fi
diff --git a/packages/inter-protocol/docs/governance-params.md b/packages/inter-protocol/docs/governance-params.md
index 4d4b1cd8149..ec96a313aa9 100644
--- a/packages/inter-protocol/docs/governance-params.md
+++ b/packages/inter-protocol/docs/governance-params.md
@@ -25,18 +25,6 @@ From Inter Protocol Whitepaper, v0.8:
 
 Note that the "stability fee" described in the Whitepaper comprises both InterestRate and LoanFee.
 
-### Automated Market Maker (AMM)
-
-In `packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js`:
-
-| Governance Key     | Type              | WP? |
-| ------------------ | :---------------- | --- |
-| PoolFee            | ParamTypes.NAT    | N/A |
-| ProtocolFee        | ParamTypes.NAT    | N/A |
-
-The Inter Protocol Whitepaper v0.8 does not describe the governance parameters
-for this contract.  
-
 ### Collateral Reserve
 
 In `packages/inter-protocol/src/reserve/collateralReserve.js`:
diff --git a/packages/inter-protocol/docs/inter-protocol-preview.md b/packages/inter-protocol/docs/inter-protocol-preview.md
index ea215e786c4..ea58a482c83 100644
--- a/packages/inter-protocol/docs/inter-protocol-preview.md
+++ b/packages/inter-protocol/docs/inter-protocol-preview.md
@@ -4,7 +4,6 @@ We propose to launch a preview of the Inter Protocol on Devnet,
 comprising the following contracts:
 
   - stakeFactory - borrow Minted against staked BLD
-  - AMM - Automated Market Maker
   - VaultFactory - collateralized debt positions
     - liquidateMinimum
   - PSM - Parity Stability Module
diff --git a/packages/inter-protocol/exported.js b/packages/inter-protocol/exported.js
index f84fbff89f7..0a2b32ef200 100644
--- a/packages/inter-protocol/exported.js
+++ b/packages/inter-protocol/exported.js
@@ -1,4 +1,3 @@
 import './src/stakeFactory/types.js';
 import './src/psm/types.js';
 import './src/vaultFactory/types.js';
-import './src/vpool-xyk-amm/types.js';
diff --git a/packages/inter-protocol/scripts/add-initial-liquidity.js b/packages/inter-protocol/scripts/add-initial-liquidity.js
deleted file mode 100644
index dcdc3226e7c..00000000000
--- a/packages/inter-protocol/scripts/add-initial-liquidity.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-import { makeNotifierFromAsyncIterable } from '@agoric/notifier';
-import { E } from '@endo/far';
-
-const { entries } = Object;
-
-const dec6 = 10n ** 6n;
-const dec4 = 10n ** 4n;
-
-const config = {
-  Central: { IST: 10_000n * dec6 },
-  Secondary: { IbcATOM: 500n * dec4 }, // 20 IST per ATOM
-};
-
-const getOfferResult = async (instance, wallet, walletAdmin) => {
-  const offerIt = E(walletAdmin).getOffersNotifier();
-  let result;
-  console.log('awaiting offers...');
-  for await (const offers of makeNotifierFromAsyncIterable(offerIt)) {
-    console.log('offers iterator next:', offers);
-    offers
-      .filter(
-        ({ status, invitationQuery }) =>
-          status === 'complete' && invitationQuery.instance === instance,
-      )
-      .forEach(async ({ id }) => {
-        result = await E(wallet).lookup('offerResult', id);
-        console.log({ facet: result });
-      });
-    if (result) break;
-  }
-  return result;
-};
-
-/**
- *
- * @param { { agoricNames: ERef<NameHub>, scratch: ERef<import('@agoric/solo/src/scratch').ScratchPad>, wallet: ERef<WalletAdmin>, zoe: ERef<ZoeService>} } homeP
- * @param { {now?: () => number }} _endowments
- *
- * @typedef {ReturnType<typeof import('../../wallet/api/src/lib-wallet').makeWalletRoot>['admin']} Wallet
- */
-const addInitialLiquidity = async (homeP, { now = () => Date.now() }) => {
-  const { wallet, agoricNames, zoe, scratch } = E.get(homeP);
-
-  const walletBridge = E(wallet).getBridge();
-
-  const getService = async name => {
-    console.log('lookup instance', name);
-    const instance = await E(agoricNames).lookup('instance', name);
-    const pub = E(zoe).getPublicFacet(instance);
-    return { instance, pub };
-  };
-  const amm = await getService('amm');
-
-  const addUsingWallet = async () => {
-    console.log('getting purses from walletBridge...');
-    const { value: pStates } = await E(
-      E(walletBridge).getPursesNotifier(),
-    ).getUpdateSince();
-    console.log(pStates);
-
-    const toAmt = detail => {
-      const [[name, value]] = entries(detail);
-      const { pursePetname } =
-        pStates.find(p => p.brandPetname === name) ||
-        assert.fail(`cannot find purse ${name}`);
-      return { pursePetname, value };
-    };
-    const proposalTemplate = {
-      give: {
-        Central: toAmt(config.Central),
-        Secondary: toAmt(config.Secondary),
-      },
-    };
-    console.log({ proposalTemplate });
-
-    console.log('amm.makeAddLiquidityInvitation...');
-    const invitation = await E(amm.pub).makeAddLiquidityInvitation();
-    console.log({ invitation });
-
-    const offerConfig = {
-      id: `${now()}`,
-      invitation,
-      instanceHandle: amm.instance,
-      proposalTemplate,
-      requestContext: undefined,
-    };
-    console.log('addOffer', offerConfig);
-    const added = await E(walletBridge).addOffer(offerConfig);
-    console.log({ added });
-
-    const result = await getOfferResult(
-      amm.instance,
-      wallet,
-      E(wallet).getAdminFacet(),
-    );
-    console.log({ result });
-  };
-
-  const addUsingZoe = async () => {
-    const { keys, values } = Object;
-    /** @type {<K extends string, V>(entries: [K, V][]) => Record<K, V>} */
-    const toRecord = Object.fromEntries;
-
-    console.log('getting purses, issuers from wallet...');
-    const [purseEntries, { value: issuerEntries }] = await Promise.all([
-      E(wallet).getPurses(),
-      E(E(walletBridge).getIssuersNotifier()).getUpdateSince(),
-    ]);
-
-    // @ts-expect-error Petname can be string[]
-    const purses = toRecord(purseEntries);
-    // @ts-expect-error Petname can be string[]
-    const issuers = toRecord(issuerEntries);
-    console.log({ purses: keys(purses), issuers: keys(issuers) });
-    assert(
-      issuers.IbcATOM,
-      'Issuers not complete. Try again after purses are provisioned',
-    );
-    const liqIssuer = E(amm.pub).getLiquidityIssuer(issuers.IbcATOM.brand);
-    const liqBrand = await E(liqIssuer).getBrand();
-
-    /** @param {Record<string, bigint>} detail */
-    const toAmt = detail => {
-      const [[name, value]] = entries(detail);
-      const issuer = issuers[name];
-      assert(issuer);
-      return AmountMath.make(issuer.brand, value);
-    };
-    /** @param {Amount} amt */
-    const withdraw = async amt => {
-      for await (const purse of values(purses)) {
-        const b2 = await E(purse).getAllegedBrand();
-        if (b2 === amt.brand) {
-          return E(purse).withdraw(amt);
-        }
-      }
-      throw Error(`no purse found for ${amt.brand}`);
-    };
-    const proposal = {
-      want: {
-        Liquidity: AmountMath.makeEmpty(liqBrand),
-      },
-      give: {
-        Central: toAmt(config.Central),
-        Secondary: toAmt(config.Secondary),
-      },
-    };
-    console.log({ proposal });
-    console.log('withdraw payments...', proposal.give);
-    const payments = {
-      Central: await withdraw(proposal.give.Central),
-      Secondary: await withdraw(proposal.give.Secondary),
-    };
-    console.log('payments', payments);
-    console.log('amm.makeAddLiquidityInvitation...');
-    const invitation = await E(amm.pub).makeAddLiquidityInvitation();
-    console.log({ invitation });
-
-    const seat = await E(zoe).offer(invitation, proposal, payments);
-    console.log({ seat });
-
-    const result = await E(seat).getOfferResult();
-    console.log({ result });
-
-    const payouts = await E(seat).getPayouts();
-    console.log('initialLiquidityPayouts', keys(payouts));
-    await E(scratch).set('initialLiquidityPayouts', payouts);
-  };
-
-  console.log(
-    addUsingWallet,
-    'does not handle want Liquidity so we do not use it',
-  );
-  await addUsingZoe();
-};
-harden(addInitialLiquidity);
-
-export default addInitialLiquidity;
diff --git a/packages/inter-protocol/scripts/deploy-contracts.js b/packages/inter-protocol/scripts/deploy-contracts.js
index a4f894eacdb..65c90565217 100644
--- a/packages/inter-protocol/scripts/deploy-contracts.js
+++ b/packages/inter-protocol/scripts/deploy-contracts.js
@@ -10,9 +10,7 @@ const contractRefs = [
   '../../governance/bundles/bundle-committee.js',
   '../../governance/bundles/bundle-binaryVoteCounter.js',
   '../bundles/bundle-stakeFactory.js',
-  '../bundles/bundle-amm.js',
   '../bundles/bundle-vaultFactory.js',
-  '../bundles/bundle-liquidateMinimum.js',
   '../bundles/bundle-reserve.js',
   '../bundles/bundle-psm.js',
   '../../vats/bundles/bundle-mintHolder.js',
diff --git a/packages/inter-protocol/scripts/init-core.js b/packages/inter-protocol/scripts/init-core.js
index c53128a074b..a937a039acc 100644
--- a/packages/inter-protocol/scripts/init-core.js
+++ b/packages/inter-protocol/scripts/init-core.js
@@ -36,14 +36,6 @@ const installKeyGroups = {
     ],
   },
   main: {
-    amm: [
-      '../src/vpool-xyk-amm/multipoolMarketMaker.js',
-      '../bundles/bundle-amm.js',
-    ],
-    interchainPool: [
-      '../src/interchainPool.js',
-      '../bundles/bundle-interchainPool.js',
-    ],
     vaultFactory: [
       '../src/vaultFactory/vaultFactory.js',
       '../bundles/bundle-vaultFactory.js',
@@ -52,14 +44,6 @@ const installKeyGroups = {
       '../src/feeDistributor.js',
       '../bundles/bundle-feeDistributor.js',
     ],
-    liquidateMinimum: [
-      '../src/vaultFactory/liquidateMinimum.js',
-      '../bundles/bundle-liquidateMinimum.js',
-    ],
-    liquidate: [
-      '../src/vaultFactory/liquidateIncrementally.js',
-      '../bundles/bundle-liquidateIncrementally.js',
-    ],
     reserve: ['../src/reserve/assetReserve.js', '../bundles/bundle-reserve.js'],
   },
 };
diff --git a/packages/inter-protocol/src/feeDistributor.js b/packages/inter-protocol/src/feeDistributor.js
index cd28efad8b6..812639be169 100644
--- a/packages/inter-protocol/src/feeDistributor.js
+++ b/packages/inter-protocol/src/feeDistributor.js
@@ -41,7 +41,7 @@ export const customTermsShape = harden({
  */
 
 /**
- * wrapper to take the vaultFactory or AMM's creatorFacet, and make a call that
+ * wrapper to take the a creatorFacet (e.g. vaultFactory) and make a call that
  * will request an invitation and return a promise for a payment.
  *
  * @param {ERef<ZoeService>} zoe
diff --git a/packages/inter-protocol/src/interchainPool.js b/packages/inter-protocol/src/interchainPool.js
deleted file mode 100644
index e49f8f181bf..00000000000
--- a/packages/inter-protocol/src/interchainPool.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { E, Far } from '@endo/far';
-import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
-import {
-  offerTo,
-  atomicTransfer,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import { MIN_INITIAL_POOL_LIQUIDITY_KEY } from './vpool-xyk-amm/params.js';
-
-const { Fail, quote: q } = assert;
-
-const COSMOS_DECIMALS = 6;
-
-/**
- * Given sufficient IST, create an issuer for an IBC denom
- * and an invitation to add a pool for it to the AMM.
- *
- * @param {ZCF<InterchainPoolTerms>} zcf
- * @param {{
- *   bankManager: ERef<BankManager>,
- * }} privateArgs
- *
- * @typedef {{
- *   amm: Instance,
- * }} InterchainPoolTerms
- *
- * @typedef {{
- *   denom: string,
- *   decimalPlaces: number,
- * }} AssetDetail
- */
-export const start = (zcf, { bankManager }) => {
-  const { amm } = zcf.getTerms();
-
-  const zoe = zcf.getZoeService();
-  /** @type {ERef<GovernedPublicFacet<XYKAMMPublicFacet>>} */
-  const ammPub = E(zoe).getPublicFacet(amm);
-
-  let kwNonce = 0;
-
-  /**
-   * @param {ZCFSeat} seat
-   * @param {AssetDetail} detail
-   */
-  const step1Handler = async (seat, detail) => {
-    assert.typeof(
-      detail,
-      'object',
-      'offer arg must be { denom, decimalPlaces? }',
-    );
-    const { denom, decimalPlaces = COSMOS_DECIMALS } = detail;
-    assert.typeof(denom, 'string');
-    assert.typeof(decimalPlaces, 'number');
-
-    const minimumCentral = await E(ammPub).getAmount(
-      MIN_INITIAL_POOL_LIQUIDITY_KEY,
-    );
-
-    const {
-      give: { Central: centralAmt },
-    } = seat.getProposal();
-    AmountMath.isGTE(centralAmt, minimumCentral) ||
-      Fail`at least ${q(minimumCentral)} required; only ${q(centralAmt)} given`;
-
-    const interAsset = makeIssuerKit(
-      denom,
-      AssetKind.NAT,
-      harden({ decimalPlaces }),
-    );
-    kwNonce += 1;
-
-    await zcf.saveIssuer(interAsset.issuer, `Interchain${kwNonce}`);
-
-    /** @type { OfferHandler } */
-    const step2Handler = async seat2 => {
-      const {
-        give: { Secondary: secondaryAmt },
-      } = seat2.getProposal();
-      AmountMath.coerce(interAsset.brand, secondaryAmt);
-
-      const liquidityIssuer = await E(ammPub).addIssuer(
-        interAsset.issuer,
-        `Interchain${kwNonce}`,
-      );
-      await zcf.saveIssuer(liquidityIssuer, `Liquidity${kwNonce}`);
-
-      const proposal = harden({
-        give: {
-          Central: centralAmt,
-          Secondary: secondaryAmt,
-        },
-      });
-
-      atomicTransfer(zcf, seat, seat2, { Central: centralAmt });
-
-      const invitation = await E(ammPub).addPoolInvitation();
-      const { userSeatPromise, deposited } = await offerTo(
-        zcf,
-        invitation,
-        undefined,
-        proposal,
-        seat2,
-      );
-      return E.when(deposited, _ => {
-        seat.exit();
-        seat2.exit();
-
-        return E(userSeatPromise).getOfferResult();
-      });
-    };
-
-    const keyword = denom; // ISSUE #5412: should not show up in all wallets.
-    const proposedName = denom;
-    const [invitation] = await Promise.all([
-      zcf.makeInvitation(step2Handler, 'interchain pool step 2'),
-      E(bankManager).addAsset(
-        denom,
-        keyword,
-        proposedName,
-        interAsset, // with mint
-      ),
-    ]);
-
-    return harden({
-      issuer: interAsset.issuer,
-      invitation,
-    });
-  };
-
-  const publicFacet = Far('InterchainPoolGateway', {
-    makeInterchainPoolInvitation: () =>
-      zcf.makeInvitation(step1Handler, 'interchain pool step 1'),
-  });
-  return { publicFacet };
-};
diff --git a/packages/inter-protocol/src/proposals/addAssetToVault.js b/packages/inter-protocol/src/proposals/addAssetToVault.js
index b49e487d18d..1874575e451 100644
--- a/packages/inter-protocol/src/proposals/addAssetToVault.js
+++ b/packages/inter-protocol/src/proposals/addAssetToVault.js
@@ -44,44 +44,6 @@ export const publishInterchainAssetFromBoardId = async (
   ]);
 };
 
-const addPool = async (
-  zoe,
-  amm,
-  issuer,
-  keyword,
-  brand,
-  runBrand,
-  runIssuer,
-) => {
-  const ammPub = E(zoe).getPublicFacet(amm);
-  const [addPoolInvitation] = await Promise.all([
-    E(ammPub).addPoolInvitation(),
-    E(ammPub).addIssuer(issuer, keyword),
-  ]);
-  const proposal = harden({
-    give: {
-      Secondary: AmountMath.makeEmpty(brand),
-      Central: AmountMath.makeEmpty(runBrand),
-    },
-  });
-  const centralPurse = E(runIssuer).makeEmptyPurse();
-  const secondaryPurse = E(issuer).makeEmptyPurse();
-  const [emptyCentral, emptySecondary] = await Promise.all([
-    E(centralPurse).withdraw(proposal.give.Central),
-    E(secondaryPurse).withdraw(proposal.give.Secondary),
-  ]);
-  const payments = harden({
-    Central: emptyCentral,
-    Secondary: emptySecondary,
-  });
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    proposal,
-    payments,
-  );
-  await E(addLiquiditySeat).getOfferResult();
-};
-
 /**
  * @param {EconomyBootstrapPowers} powers
  * @param {object} config
@@ -90,20 +52,11 @@ const addPool = async (
  */
 export const publishInterchainAssetFromBank = async (
   {
-    consume: { zoe, bankManager, agoricNamesAdmin, bankMints },
+    consume: { zoe, bankManager, agoricNamesAdmin, bankMints, reserveKit },
     produce: { bankMints: produceBankMints },
     installation: {
       consume: { mintHolder },
     },
-    instance: {
-      consume: { amm },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: runIssuer },
-    },
-    brand: {
-      consume: { [Stable.symbol]: stableBrandP },
-    },
   },
   { options: { interchainAssetOptions } },
 ) => {
@@ -129,14 +82,10 @@ export const publishInterchainAssetFromBank = async (
     E(zoe).startInstance(mintHolder, {}, terms),
   );
 
-  const [issuer, brand, runBrand] = await Promise.all([
-    issuerP,
-    E(issuerP).getBrand(),
-    stableBrandP,
-  ]);
+  const [issuer, brand] = await Promise.all([issuerP, E(issuerP).getBrand()]);
   const kit = { mint: mintP, issuer, brand };
 
-  await addPool(zoe, amm, issuer, keyword, brand, runBrand, runIssuer);
+  await E(E.get(reserveKit).creatorFacet).addIssuer(issuer, keyword);
 
   // Create the mint list if it doesn't exist and wasn't already rejected.
   produceBankMints.resolve([]);
@@ -318,14 +267,12 @@ export const getManifestForAddAssetToVault = (
             bankManager: true,
             agoricNamesAdmin: true,
             bankMints: true,
+            reserveKit: true,
           },
           produce: { bankMints: true },
           installation: {
             consume: { mintHolder: true },
           },
-          instance: { consume: { amm: 'amm' } },
-          issuer: { consume: { [Stable.symbol]: 'zoe' } },
-          brand: { consume: { [Stable.symbol]: 'zoe' } },
         },
       }),
       [registerScaledPriceAuthority.name]: {
diff --git a/packages/inter-protocol/src/proposals/committee-proposal.js b/packages/inter-protocol/src/proposals/committee-proposal.js
index 4b67bba1cfd..6d5c6543ea1 100644
--- a/packages/inter-protocol/src/proposals/committee-proposal.js
+++ b/packages/inter-protocol/src/proposals/committee-proposal.js
@@ -75,9 +75,9 @@ harden(startEconCharter);
  * @param {import('./econ-behaviors').EconomyBootstrapPowers} powers
  */
 export const addGovernorsToEconCharter = async ({
-  consume: { reserveKit, ammKit, vaultFactoryKit, econCharterKit },
+  consume: { reserveKit, vaultFactoryKit, econCharterKit },
   instance: {
-    consume: { amm, reserve, VaultFactory },
+    consume: { reserve, VaultFactory },
   },
 }) => {
   const { creatorFacet } = E.get(econCharterKit);
@@ -85,7 +85,6 @@ export const addGovernorsToEconCharter = async ({
   // Introduce charter to governed creator facets.
   await Promise.all(
     [
-      { instanceP: amm, facetP: E.get(ammKit).governorCreatorFacet },
       { instanceP: reserve, facetP: E.get(reserveKit).governorCreatorFacet },
       {
         instanceP: VaultFactory,
@@ -148,7 +147,6 @@ export const getManifestForInviteCommittee = async (
       [addGovernorsToEconCharter.name]: {
         consume: {
           reserveGovernorCreatorFacet: t,
-          ammGovernorCreatorFacet: t,
           vaultFactoryGovernorCreator: t,
           econCharterKit: t,
           zoe: t,
@@ -156,14 +154,13 @@ export const getManifestForInviteCommittee = async (
           namesByAddressAdmin: t,
           economicCommitteeCreatorFacet: t,
           reserveKit: t,
-          ammKit: t,
           vaultFactoryKit: t,
         },
         installation: {
           consume: { binaryVoteCounter: t },
         },
         instance: {
-          consume: { amm: t, reserve: t, VaultFactory: t },
+          consume: { reserve: t, VaultFactory: t },
         },
       },
       [inviteToEconCharter.name]: {
diff --git a/packages/inter-protocol/src/proposals/core-proposal.js b/packages/inter-protocol/src/proposals/core-proposal.js
index 6d3860b0ded..212f1e93804 100644
--- a/packages/inter-protocol/src/proposals/core-proposal.js
+++ b/packages/inter-protocol/src/proposals/core-proposal.js
@@ -1,7 +1,6 @@
 import { Stable } from '@agoric/vats/src/tokens.js';
 import * as econBehaviors from './econ-behaviors.js';
 import { ECON_COMMITTEE_MANIFEST } from './startEconCommittee.js';
-import * as simBehaviors from './sim-behaviors.js';
 
 export * from './econ-behaviors.js';
 export * from './sim-behaviors.js';
@@ -13,40 +12,6 @@ export * from './startEconCommittee.js'; // eslint-disable-line import/export
 /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifest} */
 const SHARED_MAIN_MANIFEST = harden({
   /** @type {import('@agoric/vats/src/core/manifest.js').BootstrapManifestPermit} */
-  [econBehaviors.setupAmm.name]: {
-    consume: {
-      board: 'board',
-      chainStorage: true,
-      chainTimerService: 'timer',
-      zoe: 'zoe',
-      economicCommitteeCreatorFacet: 'economicCommittee',
-    },
-    produce: { ammKit: 'amm' },
-    issuer: { consume: { [Stable.symbol]: 'zoe' } },
-    brand: { consume: { [Stable.symbol]: 'zoe' } },
-    installation: {
-      consume: { contractGovernor: 'zoe', amm: 'zoe' },
-    },
-    instance: {
-      produce: { ammGovernor: 'ammGovernor' },
-    },
-  },
-  [econBehaviors.startInterchainPool.name]: {
-    consume: { bankManager: 'bank', zoe: 'zoe', agoricNamesAdmin: true },
-    installation: {
-      consume: { interchainPool: 'zoe' },
-    },
-    brand: {
-      consume: { [Stable.symbol]: 'zoe' },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: 'zoe' },
-    },
-    instance: {
-      consume: { amm: 'amm' },
-      produce: { interchainPool: 'interchainPool' },
-    },
-  },
   [econBehaviors.startVaultFactory.name]: {
     consume: {
       board: 'board',
@@ -65,12 +30,10 @@ const SHARED_MAIN_MANIFEST = harden({
       consume: {
         contractGovernor: 'zoe',
         VaultFactory: 'zoe',
-        liquidate: 'zoe',
       },
     },
     instance: {
       consume: {
-        amm: 'amm',
         reserve: 'reserve',
       },
       produce: {
@@ -90,7 +53,6 @@ const SHARED_MAIN_MANIFEST = harden({
 
   [econBehaviors.setupReserve.name]: {
     consume: {
-      ammKit: 'amm',
       board: 'board',
       chainStorage: true,
       feeMintAccess: 'zoe',
@@ -105,9 +67,7 @@ const SHARED_MAIN_MANIFEST = harden({
       consume: { contractGovernor: 'zoe', reserve: 'zoe' },
     },
     instance: {
-      consume: { amm: 'amm' },
       produce: {
-        amm: 'amm',
         reserve: 'reserve',
         reserveGovernor: 'ReserveGovernor',
       },
@@ -122,7 +82,6 @@ const REWARD_MANIFEST = harden({
       bankManager: true,
       vaultFactoryKit: true,
       periodicFeeCollectors: true,
-      ammKit: true,
       stakeFactoryKit: true,
       reserveKit: true,
       zoe: true,
@@ -174,35 +133,7 @@ const STAKE_FACTORY_MANIFEST = harden({
   },
 });
 
-export const SIM_CHAIN_MANIFEST = harden({
-  [simBehaviors.fundAMM.name]: {
-    consume: {
-      centralSupplyBundle: true,
-      mintHolderBundle: true,
-      chainTimerService: 'timer',
-      bldIssuerKit: true,
-      feeMintAccess: true,
-      loadVat: true,
-      mints: 'mints',
-      priceAuthorityVat: 'priceAuthority',
-      priceAuthorityAdmin: 'priceAuthority',
-      vaultFactoryKit: 'VaultFactory',
-      zoe: true,
-    },
-    installation: {
-      consume: { centralSupply: 'zoe' },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: 'zoe' },
-    },
-    brand: {
-      consume: { [Stable.symbol]: 'zoe' },
-    },
-    instance: {
-      consume: { amm: 'amm' },
-    },
-  },
-});
+export const SIM_CHAIN_MANIFEST = harden({});
 
 export const getManifestForEconCommittee = (
   { restoreRef },
@@ -233,12 +164,9 @@ export const getManifestForMain = (
   return {
     manifest: SHARED_MAIN_MANIFEST,
     installations: {
-      amm: restoreRef(installKeys.amm),
       VaultFactory: restoreRef(installKeys.vaultFactory),
       feeDistributor: restoreRef(installKeys.feeDistributor),
-      liquidate: restoreRef(installKeys.liquidate),
       reserve: restoreRef(installKeys.reserve),
-      interchainPool: restoreRef(installKeys.interchainPool),
     },
     options: {
       vaultFactoryControllerAddress,
diff --git a/packages/inter-protocol/src/proposals/demoIssuers.js b/packages/inter-protocol/src/proposals/demoIssuers.js
index 9cfd6c6d3a1..b205840f124 100644
--- a/packages/inter-protocol/src/proposals/demoIssuers.js
+++ b/packages/inter-protocol/src/proposals/demoIssuers.js
@@ -1,6 +1,5 @@
 /* eslint-disable @jessie.js/no-nested-await -- demo file */
 import { AmountMath, AssetKind } from '@agoric/ertp';
-import { allValues, objectMap } from '@agoric/internal';
 import {
   makeRatio,
   natSafeMath,
@@ -13,8 +12,6 @@ const { Fail, quote: q } = assert;
 const { multiply, floorDivide } = natSafeMath;
 const { entries, fromEntries, keys, values } = Object;
 
-const QUOTE_INTERVAL = 5n * 60n;
-
 /** @type {Record<string, number>} */
 export const DecimalPlaces = {
   [Stake.symbol]: Stake.displayInfo.decimalPlaces,
@@ -346,7 +343,7 @@ export const connectFaucet = async ({
 harden(connectFaucet);
 
 /**
- * Calculate how much RUN we need to fund the AMM pools
+ * Calculate how much RUN we need to fund the pools
  *
  * @param {typeof AMMDemoState} issuers
  */
@@ -461,231 +458,3 @@ export const poolRates = (issuerName, record, kits, central) => {
  *   consume: { mints }
  * }} powers
  */
-export const fundAMM = async ({
-  consume: {
-    bldIssuerKit,
-    chainTimerService,
-    feeMintAccess,
-    mints,
-    priceAuthorityVat,
-    priceAuthorityAdmin,
-    vaultFactoryKit,
-    zoe,
-  },
-  installation: {
-    consume: { centralSupply: centralSupplyInstall },
-  },
-  issuer: {
-    consume: { IST: centralIssuer },
-  },
-  brand: {
-    consume: { IST: centralBrand },
-  },
-  instance: {
-    consume: { amm: ammInstance },
-  },
-}) => {
-  const { ammTotal: ammDepositValue, balances } =
-    ammPoolRunDeposits(AMMDemoState);
-
-  const vats = { mints, priceAuthority: priceAuthorityVat };
-
-  const kits = await allValues(
-    objectMap(
-      fromEntries([Stable.symbol, ...keys(AMMDemoState)].map(n => [n, n])),
-      async issuerName => {
-        switch (issuerName) {
-          case Stable.symbol: {
-            const [issuer, brand] = await Promise.all([
-              centralIssuer,
-              centralBrand,
-            ]);
-            return { mint: undefined, issuer, brand };
-          }
-          case 'BLD':
-            return bldIssuerKit;
-          default:
-            return provideCoin(issuerName, vats.mints);
-        }
-      },
-    ),
-  );
-
-  const central = /** @type {Pick<IssuerKit<'nat'>, 'issuer' | 'brand'>} */ (
-    kits[Stable.symbol]
-  );
-
-  /** @type {[ XYKAMMPublicFacet, import('@agoric/time/src/types').TimerService]} */
-  const [ammPublicFacet, timer] = await Promise.all([
-    E(zoe).getPublicFacet(ammInstance),
-    chainTimerService,
-  ]);
-
-  const ammBootstrapPayment = await mintRunPayment(ammDepositValue, {
-    centralSupplyInstall,
-    feeMintAccess,
-    zoe,
-  });
-
-  async function addAllCollateral() {
-    const issuerMap = await splitAllCentralPayments(
-      ammBootstrapPayment,
-      balances,
-      central,
-    );
-
-    return Promise.all(
-      entries(AMMDemoState).map(async ([issuerName, record]) => {
-        if (!record.config) {
-          return undefined;
-        }
-        const { rates, initialValue } = poolRates(
-          issuerName,
-          record,
-          kits,
-          central,
-        );
-
-        const kit = kits[issuerName];
-        if (!kit.mint) {
-          throw Fail`no mint for ${q(issuerName)}`;
-        }
-        // @@ doesn't work for BLD?
-        const secondaryPayment = await E(kit.mint).mintPayment(
-          AmountMath.make(kit.brand, initialValue),
-        );
-        secondaryPayment || Fail`no payment for ${q(issuerName)}`;
-        kit.issuer || Fail`No issuer for ${q(issuerName)}`;
-        const liquidityIssuer = /** @type {Promise<Issuer<'nat'>>} */ (
-          E(ammPublicFacet).addIssuer(kit.issuer, issuerName)
-        );
-        const [secondaryAmount, liquidityBrand] = await Promise.all([
-          // Error: (an undefined) was not a live payment for brand
-          //  at (.../vats/src/demoIssuers.js:591)
-          E(kit.issuer).getAmountOf(secondaryPayment),
-          E(liquidityIssuer).getBrand(),
-        ]);
-        const centralAmount = issuerMap[issuerName].amount;
-        const proposal = harden({
-          want: { Liquidity: AmountMath.makeEmpty(liquidityBrand) },
-          give: { Secondary: secondaryAmount, Central: centralAmount },
-        });
-
-        await E(zoe).offer(
-          E(ammPublicFacet).addPoolInvitation(),
-          proposal,
-          harden({
-            Secondary: secondaryPayment,
-            Central: issuerMap[issuerName].payment,
-          }),
-        );
-
-        const issuerPresence = await kit.issuer;
-        return E(E.get(vaultFactoryKit).creatorFacet).addVaultType(
-          issuerPresence,
-          issuerName,
-          rates,
-        );
-      }),
-    );
-  }
-
-  /**
-   * @param {ERef<Brand>} brandIn
-   * @param {ERef<Brand>} brandOut
-   * @param {Array<[bigint | number, bigint | number]>} tradeList
-   */
-  const makeFakePriceAuthority = (brandIn, brandOut, tradeList) =>
-    E(vats.priceAuthority).makeFakePriceAuthority({
-      actualBrandIn: brandIn,
-      actualBrandOut: brandOut,
-      tradeList,
-      timer,
-      quoteInterval: QUOTE_INTERVAL,
-    });
-
-  await addAllCollateral();
-
-  const brandsWithPriceAuthorities = await E(ammPublicFacet).getAllPoolBrands();
-
-  await Promise.all(
-    // TODO: exactly what is the list of things to iterate here?
-    entries(AMMDemoState).map(async ([issuerName, record]) => {
-      // Create priceAuthority pairs for centralIssuer based on the
-      // AMM or FakePriceAuthority.
-      console.debug(`Creating ${issuerName}-${Stable.symbol}`);
-      const issuer = kits[issuerName].issuer;
-      const { trades } = record;
-      /** @param {bigint} n */
-      const inCollateral = n => n * 10n ** BigInt(DecimalPlaces[issuerName]);
-      const tradesGivenCentral = trades.map(
-        ({ central: num, collateral: unit }) =>
-          /** @type {[bigint, bigint]} */ ([
-            run2places(num),
-            inCollateral(unit),
-          ]),
-      );
-      assert(issuer);
-      const brand = await E(issuer).getBrand();
-      let toCentral;
-      let fromCentral;
-
-      if (brandsWithPriceAuthorities.includes(brand)) {
-        ({ toCentral, fromCentral } = await E(ammPublicFacet)
-          .getPriceAuthorities(brand)
-          .catch(_e => {
-            // console.warn('could not get AMM priceAuthorities', _e);
-            return { toCentral: undefined, fromCentral: undefined };
-          }));
-      }
-
-      if (!fromCentral && tradesGivenCentral) {
-        // We have no amm from-central price authority, make one from trades.
-        if (issuerName !== Stable.symbol) {
-          console.log(
-            `Making fake price authority for ${Stable.symbol}-${issuerName}`,
-          );
-        }
-        fromCentral = makeFakePriceAuthority(
-          central.brand,
-          brand,
-          tradesGivenCentral,
-        );
-      }
-
-      if (!toCentral && central.issuer !== issuer && tradesGivenCentral) {
-        // We have no amm to-central price authority, make one from trades.
-        console.log(
-          `Making fake price authority for ${issuerName}-${Stable.symbol}`,
-        );
-        /** @type {Array<[bigint | number, bigint | number]>} */
-        const tradesGivenOther = tradesGivenCentral.map(
-          ([valueCentral, valueOther]) => [valueOther, valueCentral],
-        );
-        toCentral = makeFakePriceAuthority(
-          brand,
-          central.brand,
-          tradesGivenOther,
-        );
-      }
-
-      // Register the price pairs.
-      await Promise.all(
-        [
-          { pa: fromCentral, fromBrand: central.brand, toBrand: brand },
-          { pa: toCentral, fromBrand: brand, toBrand: central.brand },
-        ].map(async ({ pa, fromBrand, toBrand }) => {
-          const paPresence = await pa;
-          if (!paPresence) {
-            return;
-          }
-          await E(priceAuthorityAdmin).registerPriceAuthority(
-            paPresence,
-            fromBrand,
-            toBrand,
-          );
-        }),
-      );
-    }),
-  );
-};
diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js
index 8122a69f508..1b126df54bc 100644
--- a/packages/inter-protocol/src/proposals/econ-behaviors.js
+++ b/packages/inter-protocol/src/proposals/econ-behaviors.js
@@ -12,19 +12,14 @@ import { E } from '@endo/far';
 import { LienBridgeId, makeStakeReporter } from '../my-lien.js';
 import { makeReserveTerms } from '../reserve/params.js';
 import { makeStakeFactoryTerms } from '../stakeFactory/params.js';
-import { liquidationDetailTerms } from '../vaultFactory/liquidation.js';
 import { makeGovernedTerms } from '../vaultFactory/params.js';
-import { makeAmmTerms } from '../vpool-xyk-amm/params.js';
 
 const trace = makeTracer('RunEconBehaviors', false);
 
-const { Fail } = assert;
-
 const SECONDS_PER_HOUR = 60n * 60n;
 const SECONDS_PER_DAY = 24n * SECONDS_PER_HOUR;
 
 const BASIS_POINTS = 10_000n;
-const MILLI = 1_000_000n;
 
 /**
  * @typedef {GovernedCreatorFacet<import('../stakeFactory/stakeFactory.js').StakeFactoryCreator>} StakeFactoryCreator
@@ -46,13 +41,6 @@ const MILLI = 1_000_000n;
  * @typedef { WellKnownSpaces & ChainBootstrapSpace & EconomyBootstrapSpace
  * } EconomyBootstrapPowers
  * @typedef {PromiseSpaceOf<{
- *   ammKit: {
- *     instanceWithoutReserve: Instance,
- *     creatorFacet: XYKAMMCreatorFacet,
- *     governorCreatorFacet: GovernedContractFacetAccess<XYKAMMPublicFacet,XYKAMMCreatorFacet>,
- *     adminFacet: AdminFacet,
- *     publicFacet: XYKAMMPublicFacet,
- *   },
  *   economicCommitteeCreatorFacet: import('@agoric/governance/src/committee.js').CommitteeElectorateCreatorFacet,
  *   feeDistributorKit: {
  *     creatorFacet: import('../feeDistributor.js').FeeDistributorCreatorFacet,
@@ -96,164 +84,9 @@ const MILLI = 1_000_000n;
  * In production called by @agoric/vats to bootstrap.
  */
 
-/**
- * @param {EconomyBootstrapPowers} powers
- * @param {{
- *   interchainPoolOptions?: { minimumCentral?: bigint }
- * }} [options]
- */
-export const startInterchainPool = async (
-  {
-    consume: { bankManager: mgrP, zoe, agoricNamesAdmin },
-    installation: {
-      consume: { interchainPool: installation },
-    },
-    instance: {
-      consume: { amm },
-      produce: { interchainPool: _viaAgoricNamesAdmin },
-    },
-    brand: {
-      consume: { [Stable.symbol]: centralBrandP },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: centralIssuerP },
-    },
-  },
-  { interchainPoolOptions = {} } = {},
-) => {
-  trace('startInterchainPool');
-  // TODO: get minimumCentral dynamically from the AMM
-  const { minimumCentral = 100n * MILLI } = interchainPoolOptions;
-  const [centralIssuer, centralBrand, bankManager] = await Promise.all([
-    centralIssuerP,
-    centralBrandP,
-    mgrP,
-  ]);
-
-  const terms = await deeplyFulfilledObject(
-    harden({
-      minimumCentral: AmountMath.make(centralBrand, minimumCentral),
-      amm,
-    }),
-  );
-  const { instance } = await E(zoe).startInstance(
-    installation,
-    { Central: centralIssuer },
-    terms,
-    {
-      bankManager,
-    },
-  );
-
-  const instanceAdmin = E(agoricNamesAdmin).lookupAdmin('instance');
-  await E(instanceAdmin).update('interchainPool', instance);
-};
-harden(startInterchainPool);
-
-const AMM_STORAGE_PATH = 'amm'; // TODO: share with agoricNames?
-
-/**
- * @param {EconomyBootstrapPowers} powers
- * @param {{ options?: { minInitialPoolLiquidity?: bigint }}} opts
- */
-export const setupAmm = async (
-  {
-    consume: {
-      board,
-      chainTimerService,
-      zoe,
-      economicCommitteeCreatorFacet: committeeCreator,
-      chainStorage,
-    },
-    produce: { ammKit },
-    brand: {
-      consume: { [Stable.symbol]: runBrandP },
-    },
-    issuer: {
-      consume: { [Stable.symbol]: centralIssuer },
-    },
-    instance: {
-      produce: { ammGovernor },
-    },
-    installation: {
-      consume: { contractGovernor: governorInstallation, amm: ammInstallation },
-    },
-  },
-  { options = {} } = {},
-) => {
-  trace('setupAmm');
-
-  const poserInvitationP = E(committeeCreator).getPoserInvitation();
-  const [poserInvitation, runBrand] = await Promise.all([
-    poserInvitationP,
-    runBrandP,
-  ]);
-  const { minInitialPoolLiquidity = 1_000_000_000n } = options;
-
-  const ammTerms = makeAmmTerms(
-    chainTimerService,
-    E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitation),
-    AmountMath.make(runBrand, minInitialPoolLiquidity),
-  );
-
-  const storageNode = await makeStorageNodeChild(
-    chainStorage,
-    AMM_STORAGE_PATH,
-  );
-  const marshaller = await E(board).getPublishingMarshaller();
-
-  const ammGovernorTerms = await deeplyFulfilledObject(
-    harden({
-      timer: chainTimerService,
-      governedContractInstallation: ammInstallation,
-      governed: {
-        terms: ammTerms,
-        issuerKeywordRecord: { Central: centralIssuer },
-      },
-    }),
-  );
-
-  /** @type {{ creatorFacet: GovernedContractFacetAccess<XYKAMMPublicFacet,XYKAMMCreatorFacet>, publicFacet: GovernorPublic, instance: Instance, adminFacet: AdminFacet }} */
-  const g = await E(zoe).startInstance(
-    governorInstallation,
-    {},
-    ammGovernorTerms,
-    {
-      electorateCreatorFacet: committeeCreator,
-      governed: {
-        initialPoserInvitation: poserInvitation,
-        storageNode,
-        marshaller,
-      },
-    },
-  );
-
-  const [creatorFacet, ammPublicFacet, instance] = await Promise.all([
-    E(g.creatorFacet).getCreatorFacet(),
-    E(g.creatorFacet).getPublicFacet(),
-    E(g.publicFacet).getGovernedContract(),
-  ]);
-  ammKit.resolve(
-    harden({
-      creatorFacet,
-      instanceWithoutReserve: instance,
-      governorCreatorFacet: g.creatorFacet,
-      adminFacet: g.adminFacet,
-      publicFacet: ammPublicFacet,
-    }),
-  );
-
-  // Confirm that the amm was indeed setup
-  ammPublicFacet || Fail`ammPublicFacet broken  ${ammPublicFacet}`;
-
-  ammGovernor.resolve(g.instance);
-  return ammInstallation;
-};
-
 /** @param {EconomyBootstrapPowers} powers */
 export const setupReserve = async ({
   consume: {
-    ammKit: ammKitP,
     board,
     feeMintAccess: feeMintAccessP,
     chainStorage,
@@ -266,11 +99,7 @@ export const setupReserve = async ({
     consume: { [Stable.symbol]: centralIssuer },
   },
   instance: {
-    produce: {
-      amm: ammInstanceProducer,
-      reserve: reserveInstanceProducer,
-      reserveGovernor,
-    },
+    produce: { reserve: reserveInstanceProducer, reserveGovernor },
   },
   installation: {
     consume: {
@@ -282,17 +111,21 @@ export const setupReserve = async ({
   const STORAGE_PATH = 'reserve';
   trace('setupReserve');
   const poserInvitationP = E(committeeCreator).getPoserInvitation();
-  const [poserInvitation, poserInvitationAmount, feeMintAccess, ammKit] =
+
+  await poserInvitationP;
+  await E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP);
+  await feeMintAccessP;
+
+  const [poserInvitation, poserInvitationAmount, feeMintAccess] =
     await Promise.all([
       poserInvitationP,
       E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
       feeMintAccessP,
-      ammKitP,
     ]);
 
   const reserveTerms = makeReserveTerms(
     poserInvitationAmount,
-    ammKit.instanceWithoutReserve,
+    chainTimerService,
   );
 
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
@@ -342,14 +175,6 @@ export const setupReserve = async ({
   reserveInstanceProducer.resolve(instance);
   reserveGovernor.resolve(g.instance);
 
-  // AMM requires Reserve in order to add pools, but we can't provide it at startInstance
-  // time because Reserve requires AMM itself in order to be started.
-  // Now that we have the reserve, provide it to the AMM.
-  trace('Resolving the reserve public facet on the AMM');
-  await E(ammKit.creatorFacet).resolveReserveFacet(publicFacet);
-  // it now has the reserve
-  ammInstanceProducer.resolve(ammKit.instanceWithoutReserve);
-
   return reserveInstallation;
 };
 
@@ -379,12 +204,11 @@ export const startVaultFactory = async (
     },
     instance: {
       produce: instanceProduce,
-      consume: { amm: ammInstance, reserve: reserveInstance },
+      consume: { reserve: reserveInstance },
     },
     installation: {
       consume: {
         VaultFactory: vaultFactoryInstallation,
-        liquidate: liquidateInstallationP,
         contractGovernor: contractGovernorInstallation,
       },
     },
@@ -405,25 +229,23 @@ export const startVaultFactory = async (
   const shortfallInvitationP = E(
     E.get(reserveKit).creatorFacet,
   ).makeShortfallReportingInvitation();
+
   const [
     initialPoserInvitation,
     poserInvitationAmount,
     initialShortfallInvitation,
     shortfallInvitationAmount,
-    liquidateInstallation,
     feeMintAccess,
   ] = await Promise.all([
     poserInvitationP,
     E(E(zoe).getInvitationIssuer()).getAmountOf(poserInvitationP),
     shortfallInvitationP,
     E(E(zoe).getInvitationIssuer()).getAmountOf(shortfallInvitationP),
-    liquidateInstallationP,
     feeMintAccessP,
   ]);
 
   const centralBrand = await centralBrandP;
 
-  const ammPublicFacet = await E(zoe).getPublicFacet(ammInstance);
   const reservePublicFacet = await E(zoe).getPublicFacet(reserveInstance);
   const storageNode = await makeStorageNodeChild(chainStorage, STORAGE_PATH);
   const marshaller = await E(board).getReadonlyMarshaller();
@@ -434,11 +256,8 @@ export const startVaultFactory = async (
       priceAuthority,
       reservePublicFacet,
       loanTiming: loanParams,
-      liquidationInstall: liquidateInstallation,
       timer: chainTimerService,
       electorateInvitationAmount: poserInvitationAmount,
-      ammPublicFacet,
-      liquidationTerms: liquidationDetailTerms(centralBrand),
       minInitialDebt: AmountMath.make(centralBrand, minInitialDebt),
       bootstrapPaymentValue: 0n,
       shortfallInvitationAmount,
@@ -540,7 +359,6 @@ export const startRewardDistributor = async ({
     bankManager,
     vaultFactoryKit,
     periodicFeeCollectors,
-    ammKit,
     stakeFactoryKit,
     reserveKit,
     zoe,
@@ -620,7 +438,6 @@ export const startRewardDistributor = async ({
 
   const collectorKit = {
     vaultFactory: E.get(vaultFactoryKit).creatorFacet,
-    amm: E.get(ammKit).creatorFacet,
     runStake: E.get(stakeFactoryKit).creatorFacet,
   };
   await Promise.all(
diff --git a/packages/inter-protocol/src/proposals/sim-behaviors.js b/packages/inter-protocol/src/proposals/sim-behaviors.js
index fb801d180c6..006d8ee0222 100644
--- a/packages/inter-protocol/src/proposals/sim-behaviors.js
+++ b/packages/inter-protocol/src/proposals/sim-behaviors.js
@@ -1,7 +1,7 @@
 import { E, Far } from '@endo/far';
 import { addRemote } from '@agoric/vats/src/core/utils.js';
 
-export { connectFaucet, fundAMM } from './demoIssuers.js';
+export { connectFaucet } from './demoIssuers.js';
 
 /** @param {BootstrapPowers} powers */
 export const installSimEgress = async ({
diff --git a/packages/inter-protocol/src/reserve/assetReserve.js b/packages/inter-protocol/src/reserve/assetReserve.js
index 03dc9e5c597..343cad3f925 100644
--- a/packages/inter-protocol/src/reserve/assetReserve.js
+++ b/packages/inter-protocol/src/reserve/assetReserve.js
@@ -1,24 +1,16 @@
 import { E, Far } from '@endo/far';
 import { AmountMath } from '@agoric/ertp';
-import { handleParamGovernance, ParamTypes } from '@agoric/governance';
-import {
-  offerTo,
-  atomicTransfer,
-} from '@agoric/zoe/src/contractSupport/index.js';
+import { handleParamGovernance } from '@agoric/governance';
+import { atomicTransfer } from '@agoric/zoe/src/contractSupport/index.js';
 import { provideDurableMapStore, prepareKindMulti } from '@agoric/vat-data';
 
 import { makeTracer } from '@agoric/internal';
-import { AMM_INSTANCE } from './params.js';
 import { makeMetricsPublisherKit } from '../contractSupport.js';
 
 const { Fail, quote: q } = assert;
 
 const trace = makeTracer('Reserve', false);
 
-const makeLiquidityKeyword = keyword => `${keyword}Liquidity`;
-
-const nonalphanumeric = /[^A-Za-z0-9]/g;
-
 /**
  * @typedef {object} MetricsNotification
  *
@@ -56,18 +48,11 @@ const nonalphanumeric = /[^A-Za-z0-9]/g;
 
 /**
  * Asset Reserve holds onto assets for the Inter Protocol, and can
- * dispense it for various purposes under governance control. It currently
- * supports governance decisions to add liquidity to an AMM pool.
+ * dispense it for various purposes under governance control.
  *
- * This contract has the ability to mint Fee tokens, granted through its private
- * arguments. When adding liquidity to an AMM pool, it mints new Fee tokens and
- * merges them with the specified amount of collateral on hand. It then deposits
- * both into an AMM pool by using the AMM's method that allows the pool balance
- * to be determined based on the contributed funds.
- *
- * @param {ZCF<GovernanceTerms<{AmmInstance: 'instance'}> &
+ * @param {ZCF<GovernanceTerms<{}> &
  * {
- *   governedApis: ['addLiquidityToAmmPool'],
+ *   governedApis: ['burnFeesToReduceShortfall'],
  * }
  * >} zcf
  * @param {{
@@ -96,13 +81,6 @@ const start = async (zcf, privateArgs, baggage) => {
    * @type {MapStore<Keyword, Brand>}
    */
   const brandForKeyword = provideDurableMapStore(baggage, 'brandForKeyword');
-  /**
-   * @type {MapStore<Brand<'nat'>, Brand<'nat'>>}
-   */
-  const liquidityBrandForBrand = provideDurableMapStore(
-    baggage,
-    'liquidityBrandForBrand',
-  );
 
   /** @type {() => Promise<ZCFMint<'nat'>>} */
   const takeFeeMint = async () => {
@@ -133,22 +111,15 @@ const start = async (zcf, privateArgs, baggage) => {
   saveBrandKeyword(feeKit.brand, 'Fee');
   // no need to saveIssuer() b/c registerFeeMint did it
 
-  const { augmentVirtualPublicFacet, makeVirtualGovernorFacet, params } =
+  const { augmentVirtualPublicFacet, makeVirtualGovernorFacet } =
     await handleParamGovernance(
       zcf,
       privateArgs.initialPoserInvitation,
-      {
-        [AMM_INSTANCE]: ParamTypes.INSTANCE,
-      },
+      {},
       privateArgs.storageNode,
       privateArgs.marshaller,
     );
 
-  /** @type {Promise<XYKAMMPublicFacet>} */
-  const ammPublicFacet = E(zcf.getZoeService()).getPublicFacet(
-    params.getAmmInstance(),
-  );
-
   /**
    * @param {MethodContext} _context
    * @param {Issuer} issuer
@@ -171,71 +142,6 @@ const start = async (zcf, privateArgs, baggage) => {
     await zcf.saveIssuer(issuer, keyword);
   };
 
-  /**
-   * @param {MethodContext} _context
-   * @param {Issuer<'nat'>} baseIssuer on which the liquidity issuer is based
-   */
-  const addLiquidityIssuer = async (_context, baseIssuer) => {
-    const getBrand = () => {
-      try {
-        return zcf.getBrandForIssuer(baseIssuer);
-      } catch {
-        assert.fail(
-          `baseIssuer ${baseIssuer} not known; try addIssuer() first`,
-        );
-      }
-    };
-    const baseBrand = getBrand();
-    const baseKeyword = keywordForBrand.get(baseBrand);
-    const liquidityIssuer = E(ammPublicFacet).getLiquidityIssuer(baseBrand);
-    const liquidityBrand = await E(liquidityIssuer).getBrand();
-    const liquidityKeyword = makeLiquidityKeyword(baseKeyword);
-
-    trace('addLiquidityIssuer', {
-      baseBrand,
-      baseKeyword,
-      liquidityBrand,
-      liquidityKeyword,
-    });
-    saveBrandKeyword(liquidityBrand, liquidityKeyword);
-    liquidityBrandForBrand.init(baseBrand, liquidityBrand);
-
-    await zcf.saveIssuer(liquidityIssuer, liquidityKeyword);
-  };
-
-  const conjureKeyword = async baseBrand => {
-    const allegedName = await E(baseBrand).getAllegedName();
-    const safeName = allegedName.replace(nonalphanumeric, '');
-    let keyword;
-    let keywordNum = 0;
-    do {
-      // 'R' to guarantee leading uppercase
-      keyword = `R${safeName}${keywordNum || ''}`;
-      keywordNum += 1;
-    } while (brandForKeyword.has(keyword));
-    return keyword;
-  };
-
-  /**
-   * @param {MethodContext} context
-   * @param {Brand<'nat'>} ammSecondaryBrand
-   * @returns {Promise<void>}
-   */
-  const addIssuerFromAmm = async (context, ammSecondaryBrand) => {
-    assert(
-      ammSecondaryBrand !== feeKit.brand,
-      'Fee is a special case handled by the reserve contract',
-    );
-
-    const keyword = await conjureKeyword(ammSecondaryBrand);
-    trace('addIssuerFromAmm', { ammSecondaryBrand, keyword });
-    // validate the AMM has this brand and match its issuer
-    const issuer = await E(ammPublicFacet).getSecondaryIssuer(
-      ammSecondaryBrand,
-    );
-    await addIssuer(context, issuer, keyword);
-  };
-
   const getKeywordForBrand = brand => {
     keywordForBrand.has(brand) ||
       Fail`Issuer not defined for brand ${q(brand)}; first call addIssuer()`;
@@ -319,70 +225,6 @@ const start = async (zcf, privateArgs, baggage) => {
     return initialState;
   };
 
-  /**
-   * Takes collateral from the reserve, mints Fee tokens to accompany it, and uses both
-   * to add Liquidity to a pool in the AMM.
-   *
-   * @param {MethodContext} context
-   * @param {Amount<'nat'>} collateral
-   * @param {Amount<'nat'>} fee
-   */
-  const addLiquidityToAmmPool = async ({ state }, collateral, fee) => {
-    // verify we have the funds
-    const collateralKeyword = getKeywordForBrand(collateral.brand);
-    if (
-      !AmountMath.isGTE(
-        collateralSeat.getCurrentAllocation()[collateralKeyword],
-        collateral,
-      )
-    ) {
-      throw new Error('insufficient reserves for that transaction');
-    }
-
-    // create the Fee tokens
-    const offerToSeat = feeMint.mintGains(harden({ Fee: fee }));
-    state.totalFeeMinted = AmountMath.add(state.totalFeeMinted, fee);
-
-    atomicTransfer(zcf, collateralSeat, offerToSeat, {
-      [collateralKeyword]: collateral,
-    });
-
-    // Add Fee tokens and collateral to the AMM
-    const invitation = await E(
-      ammPublicFacet,
-    ).makeAddLiquidityAtRateInvitation();
-    const mapping = harden({
-      Fee: 'Central',
-      [collateralKeyword]: 'Secondary',
-    });
-
-    const liqBrand = liquidityBrandForBrand.get(collateral.brand);
-    const proposal = harden({
-      give: {
-        Central: fee,
-        Secondary: collateral,
-      },
-      want: { Liquidity: AmountMath.makeEmpty(liqBrand) },
-    });
-
-    // chain await the completion of both the offer and the `deposited` promise
-    await E.get(offerTo(zcf, invitation, mapping, proposal, offerToSeat))
-      .deposited;
-
-    // transfer from userSeat to LiquidityToken holdings
-    const liquidityAmount = offerToSeat.getCurrentAllocation();
-    const liquidityKeyword = makeLiquidityKeyword(collateralKeyword);
-
-    atomicTransfer(
-      zcf,
-      offerToSeat,
-      collateralSeat,
-      { Liquidity: liquidityAmount.Liquidity },
-      { [liquidityKeyword]: liquidityAmount.Liquidity },
-    );
-    updateMetrics({ state });
-  };
-
   /**
    *
    * @param {MethodContext} context
@@ -431,13 +273,11 @@ const start = async (zcf, privateArgs, baggage) => {
     getMetrics: () => metricsSubscription,
   });
 
-  const governedApis = { addLiquidityToAmmPool, burnFeesToReduceShortfall };
+  const governedApis = { burnFeesToReduceShortfall };
 
   const publicFacet = augmentVirtualPublicFacet(
     Far('Collateral Reserve public', {
       makeAddCollateralInvitation,
-      addIssuerFromAmm,
-      addLiquidityIssuer,
     }),
   );
 
@@ -467,7 +307,7 @@ export { start };
  * @typedef {object} OriginalAssetReserveCreatorFacet
  * @property {() => Invitation} makeAddCollateralInvitation
  * @property {() => Allocation} getAllocations
- * @property {(issuer: Issuer) => void} addIssuer
+ * @property {(issuer: Issuer, kwd: string) => void} addIssuer
  * @property {() => Invitation<ShortfallReporter>} makeShortfallReportingInvitation
  * @property {() => StoredSubscription<MetricsNotification>} getMetrics
  */
@@ -475,7 +315,6 @@ export { start };
 /**
  * @typedef {object} OriginalAssetReservePublicFacet
  * @property {() => Invitation} makeAddCollateralInvitation
- * @property {(brand: Brand) => void} addIssuerFromAmm
  * @property {(issuer: Issuer) => void} addLiquidityIssuer
  */
 
diff --git a/packages/inter-protocol/src/reserve/params.js b/packages/inter-protocol/src/reserve/params.js
index 85d4c52c3a3..d37dd4e262f 100644
--- a/packages/inter-protocol/src/reserve/params.js
+++ b/packages/inter-protocol/src/reserve/params.js
@@ -1,11 +1,8 @@
 import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 
-export const AMM_INSTANCE = 'AmmInstance';
-
-const makeReserveTerms = (poserInvitationAmount, ammInstance, timer) => ({
+const makeReserveTerms = (poserInvitationAmount, timer) => ({
   timer,
   governedParams: harden({
-    [AMM_INSTANCE]: { type: ParamTypes.INSTANCE, value: ammInstance },
     [CONTRACT_ELECTORATE]: {
       type: ParamTypes.INVITATION,
       value: poserInvitationAmount,
diff --git a/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js b/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js
index 55227d114e9..4eee574bcfd 100644
--- a/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js
+++ b/packages/inter-protocol/src/vaultFactory/liquidateIncrementally.js
@@ -1,13 +1,12 @@
 /* eslint-disable no-await-in-loop */
 import { E } from '@endo/eventual-send';
 import {
-  getAmountOut,
   assertProposalShape,
-  offerTo,
-  natSafeMath as NatMath,
+  atomicTransfer,
   ceilMultiplyBy,
+  getAmountOut,
+  offerTo,
   oneMinus,
-  atomicTransfer,
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { AmountMath } from '@agoric/ertp';
 import { Far } from '@endo/marshal';
@@ -46,9 +45,11 @@ const trace = makeTracer('LiqI', false);
  * TODO integrate the reserve, including the above Reserve strategies.
  */
 
+// TODO: (#7047) this file goes away shortly, and is here to keep vaults happy
+// until we have a replacement
 /**
  * @typedef {{
- *   amm: XYKAMMPublicFacet,
+ *   amm: unknown,
  *   priceAuthority: PriceAuthority,
  *   reservePublicFacet: AssetReservePublicFacet,
  *   timerService: import('@agoric/time/src/types').TimerService,
@@ -61,24 +62,13 @@ const trace = makeTracer('LiqI', false);
  */
 const start = async zcf => {
   const {
-    amm,
     priceAuthority,
     reservePublicFacet,
     timerService,
     debtBrand,
-    MaxImpactBP,
     OracleTolerance,
-    AMMMaxSlippage,
   } = zcf.getTerms();
 
-  const SCALE = 1_000_000n;
-  const BASIS_POINTS = 10_000n * SCALE;
-  const BP2 = BASIS_POINTS * BASIS_POINTS;
-  const ONE = BASIS_POINTS;
-
-  const asFloat = (numerator, denominator) =>
-    Number(numerator) / Number(denominator);
-
   // #region penalty distribution
   const { zcfSeat: penaltyPoolSeat } = zcf.makeEmptySeatKit();
   const drainPenaltyPool = async () => {
@@ -100,81 +90,10 @@ const start = async zcf => {
   };
   // #endregion
 
-  /**
-   * Compute the tranche size whose sale on the AMM would have
-   * a price impact of MAX_IMPACT_BP.
-   * This doesn't use ratios so that it is usable for any brand
-   *
-   * @param {Amount<'nat'>} poolSize
-   * @param {bigint} maxImpactBP
-   * @param {bigint} feeBP
-   * @returns {Amount<'nat'>}
-   */
-  const maxTrancheWithFees = (poolSize, maxImpactBP, feeBP) => {
-    trace('maxTrancheWithFees', poolSize, maxImpactBP, feeBP);
-    const maxImpactScaled = maxImpactBP * SCALE;
-    const ammFeeScaled = feeBP * SCALE;
-    // sqrt(impact + 1) - 1
-    // Since we take SQRT but want to be BP, multiply in BP
-    const impactFactor =
-      BigInt(
-        Math.ceil(Math.sqrt(Number((maxImpactScaled + ONE) * BASIS_POINTS))),
-      ) - ONE;
-    const impactWithFee = impactFactor * (ONE - ammFeeScaled);
-    return AmountMath.make(
-      poolSize.brand,
-      NatMath.ceilDivide(NatMath.multiply(poolSize.value, impactWithFee), BP2),
-    );
-  };
-
   const computeOracleLimit = (oracleQuote, oracleTolerance) => {
     return ceilMultiplyBy(getAmountOut(oracleQuote), oneMinus(oracleTolerance));
   };
 
-  const getAMMFeeBP = async () => {
-    const zoe = zcf.getZoeService();
-    const instance = await E(zoe).getInstance(E(amm).makeSwapInvitation());
-    const terms = await E(zoe).getTerms(instance);
-    // trace('amm terms', terms);
-    const { poolFeeBP, protocolFeeBP } = terms;
-    return poolFeeBP + protocolFeeBP;
-  };
-
-  const AMMFeeBP = await getAMMFeeBP();
-
-  /**
-   *
-   * @param {Amount<'nat'>} poolCentral
-   * @param {Amount<'nat'>} poolCollateral
-   * @param {Amount<'nat'>} tranche
-   * @param {Amount<'nat'>} debt
-   * @param {Ratio} maxSlip
-   */
-  const estimateAMMProceeds = (
-    poolCentral,
-    poolCollateral,
-    tranche,
-    debt,
-    maxSlip,
-  ) => {
-    const k = NatMath.multiply(poolCentral.value, poolCollateral.value);
-    const postSaleCollateral = AmountMath.add(tranche, poolCollateral);
-    const estimateCentral = NatMath.subtract(
-      poolCentral.value,
-      NatMath.floorDivide(k, postSaleCollateral.value),
-    );
-    /** @type {Amount<'nat'>} */
-    const estimateAmount = AmountMath.make(debt.brand, estimateCentral);
-    const minAmmProceeds = ceilMultiplyBy(estimateAmount, oneMinus(maxSlip));
-    trace('AMM estimate', {
-      tranche,
-      minAmmProceeds,
-      poolCentral,
-      poolCollateral,
-    });
-    return minAmmProceeds;
-  };
-
   /**
    * A generator that yields once per block, starting in the current block.
    *
@@ -207,28 +126,10 @@ const start = async zcf => {
       }
       await oncePerBlock();
 
-      // Determine the max allowed tranche size
-      const { Secondary: poolCollateral, Central: poolCentral } = await E(
-        amm,
-      ).getPoolAllocation(toSell.brand);
-      const maxAllowedTranche = maxTrancheWithFees(
-        poolCollateral,
-        MaxImpactBP,
-        AMMFeeBP,
-      );
-      trace('Pool', { poolCentral, poolCollateral });
-      trace('Max tranche', asFloat(maxAllowedTranche.value, 100000n));
-      const tranche = AmountMath.min(maxAllowedTranche, toSell);
+      const tranche = toSell;
 
       // compute the expected proceeds from the AMM for tranche
       const debt = AmountMath.subtract(originalDebt, proceedsSoFar);
-      const minAmmProceeds = estimateAMMProceeds(
-        poolCentral,
-        poolCollateral,
-        tranche,
-        debt,
-        AMMMaxSlippage,
-      );
 
       // this could use a unit rather than the tranche size to run concurrently
       /** @type PriceQuote */
@@ -238,43 +139,15 @@ const start = async zcf => {
       );
       const oracleLimit = computeOracleLimit(oracleQuote, OracleTolerance);
 
-      trace('Tranche', { debt, tranche, minAmmProceeds, oracleLimit });
-      if (AmountMath.isGTE(minAmmProceeds, oracleLimit)) {
-        // our prices are within the same range; go ahead and try to sell
-        yield {
-          collateral: tranche,
-          ammProceeds: minAmmProceeds,
-          debt,
-          oracleLimit,
-        };
-      } else {
-        // prices are too far apart; don't sell this block
-        trace('SKIP');
-      }
+      trace('Tranche', { debt, tranche, oracleLimit });
+      yield {
+        collateral: tranche,
+        debt,
+        oracleLimit,
+      };
     }
   }
 
-  async function sellTranche(debtorSeat, collateral, debt, oracleLimit) {
-    const swapInvitation = E(amm).makeSwapInvitation();
-    const want = AmountMath.min(debt, oracleLimit);
-    // TODO if the debt shouldn't require all the collatearal to cover it,
-    // this may not provide relevant offer safety
-    const proposal = {
-      give: { In: collateral },
-      want: { Out: want },
-    };
-    const { deposited, userSeatPromise: liqSeat } = await offerTo(
-      zcf,
-      swapInvitation,
-      undefined, // The keywords were mapped already
-      proposal,
-      debtorSeat,
-      debtorSeat,
-      { stopAfter: debt },
-    );
-    await Promise.all([E(liqSeat).getOfferResult(), deposited]);
-  }
-
   /**
    * @param {ZCFSeat} debtorSeat
    * @param {object} options
@@ -305,7 +178,9 @@ const start = async zcf => {
       const collateralBefore = debtorSeat.getAmountAllocated('In');
       const proceedsBefore = debtorSeat.getAmountAllocated('Out');
 
-      await sellTranche(debtorSeat, collateral, debt, oracleLimit);
+      // AMM is gone. This liquidation contract will depart with #7047
+
+      // await sellTranche(debtorSeat, collateral, debt, oracleLimit);
 
       const proceedsAfter = debtorSeat.getAmountAllocated('Out');
       if (AmountMath.isEqual(proceedsBefore, proceedsAfter)) {
diff --git a/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js b/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js
index ef2bb805dc9..35bc84d7a96 100644
--- a/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js
+++ b/packages/inter-protocol/src/vaultFactory/liquidateMinimum.js
@@ -1,7 +1,5 @@
-import { E } from '@endo/eventual-send';
 import {
   ceilMultiplyBy,
-  offerTo,
   atomicTransfer,
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { AmountMath } from '@agoric/ertp';
@@ -11,6 +9,9 @@ import { makeTracer } from '@agoric/internal';
 
 const trace = makeTracer('LiqMin', false);
 
+// TODO: (#7047) this file goes away shortly, and is here to keep vaults happy
+// until we have a replacement. The reference to AMM is to ease the transition.
+
 /**
  * This contract liquidates the minimum amount of vault's collateral necessary
  * to satisfy the debt. It uses the AMM's swapOut, which sells no more than
@@ -19,11 +20,10 @@ const trace = makeTracer('LiqMin', false);
  * uses the AMM's swapIn instead.
  *
  * @param {ZCF<{
- *   amm: XYKAMMPublicFacet,
+ *   amm: unknown,
  * }>} zcf
  */
 const start = async zcf => {
-  const { amm } = zcf.getTerms();
   trace('start', zcf.getTerms());
 
   /**
@@ -45,27 +45,25 @@ const start = async zcf => {
       give: { In: amountIn },
     } = debtorSeat.getProposal();
 
-    const swapInvitation = E(amm).makeSwapInvitation();
-    const liqProposal = harden({
-      give: { In: amountIn },
-      want: { Out: AmountMath.makeEmpty(debtBrand) },
-    });
-    trace(`OFFER TO DEBT: `, debtWithPenalty, amountIn);
-    const { deposited } = await offerTo(
-      zcf,
-      swapInvitation,
-      undefined, // The keywords were mapped already
-      liqProposal,
-      debtorSeat,
-      debtorSeat,
-      { stopAfter: debtWithPenalty },
-    );
-    const amounts = await deposited;
+    // AMM is gone, and liquidateMinimum will follow shortly in #7074
+
+    // const liqProposal = harden({
+    //   give: { In: amountIn },
+    //   want: { Out: AmountMath.makeEmpty(debtBrand) },
+    // });
+    // const { deposited } = await offerTo(
+    //   zcf,
+    //   swapInvitation,
+    //   undefined, // The keywords were mapped already
+    //   liqProposal,
+    //   debtorSeat,
+    //   debtorSeat,
+    //   { stopAfter: debtWithPenalty },
+    // );
     trace(`Liq results`, {
       debtWithPenalty,
       amountIn,
       paid: debtorSeat.getCurrentAllocation(),
-      amounts,
     });
 
     // Now we need to know how much was sold so we can pay off the debt.
diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
index 492f38e80d6..6487e644f11 100644
--- a/packages/inter-protocol/src/vaultFactory/params.js
+++ b/packages/inter-protocol/src/vaultFactory/params.js
@@ -21,24 +21,18 @@ export const LIQUIDATION_PADDING_KEY = 'LiquidationPadding';
 export const LIQUIDATION_PENALTY_KEY = 'LiquidationPenalty';
 export const INTEREST_RATE_KEY = 'InterestRate';
 export const LOAN_FEE_KEY = 'LoanFee';
-export const LIQUIDATION_INSTALL_KEY = 'LiquidationInstall';
-export const LIQUIDATION_TERMS_KEY = 'LiquidationTerms';
 export const MIN_INITIAL_DEBT_KEY = 'MinInitialDebt';
 export const SHORTFALL_INVITATION_KEY = 'ShortfallInvitation';
 export const ENDORSED_UI_KEY = 'EndorsedUI';
 
 /**
  * @param {Amount} electorateInvitationAmount
- * @param {Installation} liquidationInstall
- * @param {import('./liquidation.js').LiquidationTerms} liquidationTerms
  * @param {Amount} minInitialDebt
  * @param {Amount} shortfallInvitationAmount
  * @param {string} endorsedUi
  */
 const makeVaultDirectorParams = (
   electorateInvitationAmount,
-  liquidationInstall,
-  liquidationTerms,
   minInitialDebt,
   shortfallInvitationAmount,
   endorsedUi,
@@ -48,14 +42,6 @@ const makeVaultDirectorParams = (
       type: ParamTypes.INVITATION,
       value: electorateInvitationAmount,
     },
-    [LIQUIDATION_INSTALL_KEY]: {
-      type: ParamTypes.INSTALLATION,
-      value: liquidationInstall,
-    },
-    [LIQUIDATION_TERMS_KEY]: {
-      type: ParamTypes.UNKNOWN,
-      value: liquidationTerms,
-    },
     [MIN_INITIAL_DEBT_KEY]: {
       type: ParamTypes.AMOUNT,
       value: minInitialDebt,
@@ -118,8 +104,6 @@ export const vaultParamPattern = M.splitRecord(
  * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit
  * @param {ERef<ZoeService>} zoe
  * @param {Invitation} electorateInvitation
- * @param {Installation} liquidationInstall
- * @param {object} liquidationTerms
  * @param {Amount} minInitialDebt
  * @param {Invitation} shortfallInvitation
  * @param {string} [endorsedUi]
@@ -128,8 +112,6 @@ export const makeVaultDirectorParamManager = async (
   publisherKit,
   zoe,
   electorateInvitation,
-  liquidationInstall,
-  liquidationTerms,
   minInitialDebt,
   shortfallInvitation,
   endorsedUi = 'NO ENDORSEMENT',
@@ -138,8 +120,6 @@ export const makeVaultDirectorParamManager = async (
     publisherKit,
     {
       [CONTRACT_ELECTORATE]: [ParamTypes.INVITATION, electorateInvitation],
-      [LIQUIDATION_INSTALL_KEY]: [ParamTypes.INSTALLATION, liquidationInstall],
-      [LIQUIDATION_TERMS_KEY]: [ParamTypes.UNKNOWN, liquidationTerms],
       [MIN_INITIAL_DEBT_KEY]: [ParamTypes.AMOUNT, minInitialDebt],
       [SHORTFALL_INVITATION_KEY]: [ParamTypes.INVITATION, shortfallInvitation],
       [ENDORSED_UI_KEY]: [ParamTypes.STRING, endorsedUi],
@@ -158,10 +138,7 @@ harden(makeVaultDirectorParamManager);
  *   priceAuthority: ERef<PriceAuthority>,
  *   timer: ERef<import('@agoric/time/src/types').TimerService>,
  *   reservePublicFacet: AssetReservePublicFacet,
- *   liquidationInstall: Installation,
  *   loanTiming: LoanTiming,
- *   liquidationTerms: import('./liquidation.js').LiquidationTerms,
- *   ammPublicFacet: XYKAMMPublicFacet,
  *   shortfallInvitationAmount: Amount,
  *   endorsedUi?: string,
  * }} opts
@@ -169,11 +146,8 @@ harden(makeVaultDirectorParamManager);
 export const makeGovernedTerms = (
   { storageNode, marshaller },
   {
-    ammPublicFacet,
     bootstrapPaymentValue,
     electorateInvitationAmount,
-    liquidationInstall,
-    liquidationTerms,
     loanTiming,
     minInitialDebt,
     priceAuthority,
@@ -198,15 +172,12 @@ export const makeGovernedTerms = (
   ).getParams();
 
   return harden({
-    ammPublicFacet,
     priceAuthority,
     loanTimingParams,
     reservePublicFacet,
     timerService: timer,
     governedParams: makeVaultDirectorParams(
       electorateInvitationAmount,
-      liquidationInstall,
-      liquidationTerms,
       minInitialDebt,
       shortfallInvitationAmount,
       endorsedUi,
diff --git a/packages/inter-protocol/src/vaultFactory/types.js b/packages/inter-protocol/src/vaultFactory/types.js
index 2902cf4a7eb..8869689c131 100644
--- a/packages/inter-protocol/src/vaultFactory/types.js
+++ b/packages/inter-protocol/src/vaultFactory/types.js
@@ -100,12 +100,6 @@
  * @property {RelativeTime} recordingPeriod in seconds
  */
 
-/**
- * @typedef {object} AMMFees
- * @property {bigint} poolFee
- * @property {bigint} protocolFee
- */
-
 /**
  * @typedef {object} LiquidationStrategy
  * @property {() => KeywordKeywordRecord} keywordMapping
diff --git a/packages/inter-protocol/src/vaultFactory/vault.js b/packages/inter-protocol/src/vaultFactory/vault.js
index 279bfe8ceb1..8fac5319e86 100644
--- a/packages/inter-protocol/src/vaultFactory/vault.js
+++ b/packages/inter-protocol/src/vaultFactory/vault.js
@@ -137,9 +137,7 @@ const allocationsChangedSinceQuote = (
   if (AmountMath.isGTE(newCollateralPre, newCollateral)) {
     // The collateral did not go up. If the collateral decreased, we pro-rate maxDebt.
     // We can pro-rate maxDebt because the quote is either linear (price is
-    // unchanging) or super-linear (also called "convex"). Super-linear is from
-    // AMMs: selling less collateral would mean an even smaller price impact, so
-    // this is a conservative choice.
+    // unchanging) or super-linear (also called "convex").
     const debtPerCollateral = makeRatioFromAmounts(
       maxDebtPre,
       newCollateralPre,
diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
index b2986827dfa..d10be2efb9f 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
@@ -3,13 +3,12 @@ import { AmountMath, AmountShape, BrandShape, IssuerShape } from '@agoric/ertp';
 import {
   makePublicTopic,
   makeStoredPublisherKit,
-  observeIteration,
   pipeTopicToStorage,
   prepareDurablePublishKit,
   SubscriberShape,
   TopicsRecordShape,
 } from '@agoric/notifier';
-import { keyEQ, M, makeScalarMapStore, mustMatch } from '@agoric/store';
+import { M, makeScalarMapStore, mustMatch } from '@agoric/store';
 import {
   defineDurableExoClassKit,
   makeKindHandle,
@@ -134,11 +133,6 @@ export const prepareVaultDirector = (
     };
   };
 
-  const getLiquidationConfig = () => ({
-    install: directorParamManager.getLiquidationInstall(),
-    terms: directorParamManager.getLiquidationTerms(),
-  });
-
   /**
    * @returns {MetricsNotification}
    */
@@ -149,29 +143,6 @@ export const prepareVaultDirector = (
     });
   };
 
-  /**
-   *
-   * @param {VaultManager} vaultManager
-   * @param {Installation<unknown>} oldInstall
-   * @param {unknown} oldTerms
-   */
-  const watchGovernance = (vaultManager, oldInstall, oldTerms) => {
-    const subscription = directorParamManager.getSubscription();
-    void observeIteration(subscription, {
-      updateState(_paramUpdate) {
-        const { install, terms } = getLiquidationConfig();
-        if (install === oldInstall && keyEQ(terms, oldTerms)) {
-          return;
-        }
-        oldInstall = install;
-        oldTerms = terms;
-        vaultManager
-          .setupLiquidator(install, terms)
-          .catch(e => console.error('Failed to setup liquidator', e));
-      },
-    });
-  };
-
   const updateShortfallReporter = async () => {
     const oldInvitation = baggage.has(shortfallInvitationKey)
       ? baggage.get(shortfallInvitationKey)
@@ -409,9 +380,6 @@ export const prepareVaultDirector = (
 
           const { self: vm } = makeVaultManager();
           collateralTypes.init(collateralBrand, vm);
-          const { install, terms } = getLiquidationConfig();
-          await vm.setupLiquidator(install, terms);
-          watchGovernance(vm, install, terms);
           facets.machine.updateMetrics();
           state.managerCounter += 1;
           return vm;
diff --git a/packages/inter-protocol/src/vaultFactory/vaultFactory.js b/packages/inter-protocol/src/vaultFactory/vaultFactory.js
index b32fff10e23..c8948bea4c5 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultFactory.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultFactory.js
@@ -6,10 +6,8 @@ import '@agoric/zoe/src/contracts/exported.js';
 //
 // addVaultType is a closely held method that adds a brand new collateral type.
 // It specifies the initial exchange rate for that type. It depends on a
-// separately specified AMM to provide the ability to liquidate loans that are
-// in arrears. We could check that the AMM has sufficient liquidity, but for the
-// moment leave that to those participating in the governance process for adding
-// new collateral type to ascertain.
+// separately specified mechanism to liquidate loans that are
+// in arrears.
 
 // This contract wants to be managed by a contractGovernor, but it isn't
 // compatible with contractGovernor, since it has a separate paramManager for
@@ -22,8 +20,6 @@ import { makeStoredPublisherKit } from '@agoric/notifier';
 import { assertAllDefined } from '@agoric/internal';
 import {
   makeVaultDirectorParamManager,
-  LIQUIDATION_INSTALL_KEY,
-  LIQUIDATION_TERMS_KEY,
   MIN_INITIAL_DEBT_KEY,
   ENDORSED_UI_KEY,
 } from './params.js';
@@ -31,8 +27,6 @@ import { prepareVaultDirector } from './vaultDirector.js';
 
 /**
  * @typedef {ZCF<GovernanceTerms<import('./params').VaultDirectorParams> & {
- *   ammPublicFacet: AutoswapPublicFacet,
- *   liquidationInstall: Installation<import('./liquidateMinimum.js').start>,
  *   loanTimingParams: {ChargingPeriod: ParamValueTyped<'nat'>, RecordingPeriod: ParamValueTyped<'nat'>},
  *   minInitialDebt: Amount,
  *   priceAuthority: ERef<PriceAuthority>,
@@ -74,8 +68,6 @@ export const start = async (zcf, privateArgs, baggage) => {
   }));
 
   const {
-    [LIQUIDATION_INSTALL_KEY]: { value: liqInstall },
-    [LIQUIDATION_TERMS_KEY]: { value: liqTerms },
     [MIN_INITIAL_DEBT_KEY]: { value: minInitialDebt },
     [ENDORSED_UI_KEY]: { value: endorsedUi },
   } = zcf.getTerms().governedParams;
@@ -84,8 +76,6 @@ export const start = async (zcf, privateArgs, baggage) => {
     makeStoredPublisherKit(storageNode, marshaller, 'governance'),
     zcf.getZoeService(),
     initialPoserInvitation,
-    liqInstall,
-    liqTerms,
     minInitialDebt,
     initialShortfallInvitation,
     endorsedUi,
diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
index 7f559365c64..f07b07cb700 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultManager.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -39,20 +39,15 @@ import {
 } from '@agoric/vat-data';
 import {
   assertProposalShape,
-  atomicTransfer,
-  ceilDivideBy,
-  getAmountIn,
-  getAmountOut,
   makeRatio,
-  makeRatioFromAmounts,
   provideEmptySeat,
 } from '@agoric/zoe/src/contractSupport/index.js';
-import { InstallationShape, SeatShape } from '@agoric/zoe/src/typeGuards.js';
+import { SeatShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/eventual-send';
 import { TransferPartShape } from '@agoric/zoe/src/contractSupport/atomicTransfer.js';
 import { checkDebtLimit } from '../contractSupport.js';
 import { chargeInterest } from '../interest.js';
-import { liquidate, makeQuote, updateQuote } from './liquidation.js';
+import { updateQuote } from './liquidation.js';
 import { maxDebtForVault } from './math.js';
 import { makePrioritizedVaults } from './prioritizedVaults.js';
 import { Phase, prepareVault } from './vault.js';
@@ -207,6 +202,8 @@ export const prepareVaultManagerKit = (
   );
 
   const poolIncrementSeat = provideEmptySeat(zcf, baggage, 'pool increment');
+
+  // TODO(#7074) not used while liquidation is disabled. Reinstate with #7074
   const retainedCollateralSeat = provideEmptySeat(
     zcf,
     baggage,
@@ -229,8 +226,11 @@ export const prepareVaultManagerKit = (
   // ephemeral state
   /** @type {boolean} */
   let liquidationQueueing = false;
+
+  // TODO: (#7047) this variable is vestigial and will go away when we replace
+  //  liquidation with use of an Auction
   /** @type {Promise<MutableQuote>?} */
-  let outstandingQuote = null;
+  const outstandingQuote = null;
 
   /**
    * This class is a singleton kind so initState will be called only once per prepare.
@@ -297,11 +297,7 @@ export const prepareVaultManagerKit = (
       }),
       self: M.interface('self', {
         getGovernedParams: M.call().returns(M.remotable()),
-        liquidateAll: M.call().returns(M.promise()),
         makeVaultKit: M.call(SeatShape).returns(M.promise()),
-        setupLiquidator: M.call(InstallationShape, M.record()).returns(
-          M.promise(),
-        ),
         getCollateralQuote: M.call().returns(M.promise()),
         getPublicFacet: M.call().returns(M.remotable()),
       }),
@@ -445,7 +441,6 @@ export const prepareVaultManagerKit = (
          * @returns {Promise<void>}
          */
         async reschedulePriceCheck(highestRatio) {
-          const { facets } = this;
           trace('reschedulePriceCheck', collateralBrand, {
             liquidationQueueing,
             outstandingQuote: !!outstandingQuote,
@@ -454,13 +449,8 @@ export const prepareVaultManagerKit = (
           // and process liquidations over time.
           if (!liquidationQueueing) {
             liquidationQueueing = true;
-            // eslint-disable-next-line consistent-return
-            return facets.helper
-              .processLiquidations()
-              .catch(e => console.error('Liquidator failed', e))
-              .finally(() => {
-                liquidationQueueing = false;
-              });
+            // TODO(7047) replace with new approach to liquidation
+            return;
           }
 
           if (!outstandingQuote) {
@@ -485,150 +475,6 @@ export const prepareVaultManagerKit = (
           updateQuote(outstandingQuote, highestDebtRatio, liquidationMargin);
           trace('update quote', collateralBrand, highestDebtRatio);
         },
-
-        async processLiquidations() {
-          const { facets } = this;
-          const govParams = factoryPowers.getGovernedParams();
-
-          async function* eventualLiquidations() {
-            while (true) {
-              const highestDebtRatio = prioritizedVaults.highestRatio();
-              if (!highestDebtRatio) {
-                return;
-              }
-              const liquidationMargin = govParams.getLiquidationMargin();
-
-              // ask to be alerted when the price level falls enough that the vault
-              // with the highest debt to collateral ratio will no longer be valued at the
-              // liquidationMargin above its debt.
-              outstandingQuote = makeQuote(
-                priceAuthority,
-                highestDebtRatio,
-                liquidationMargin,
-              );
-              trace('posted quote request', collateralBrand, highestDebtRatio);
-
-              // The rest of this method will not happen until after a quote is received.
-              // This may not happen until much later, when the market changes.
-              // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await -- loop/nesting to yield each unconditionally
-              const quote = await E(outstandingQuote).getPromise();
-              outstandingQuote = null;
-              // When we receive a quote, we check whether the vault with the highest
-              // ratio of debt to collateral is below the liquidationMargin, and if so,
-              // we liquidate it. We use ceilDivide to round up because ratios above
-              // this will be liquidated.
-              const quoteRatioPlusMargin = makeRatioFromAmounts(
-                ceilDivideBy(getAmountOut(quote), liquidationMargin),
-                getAmountIn(quote),
-              );
-              trace('quote', collateralBrand, quote, quoteRatioPlusMargin);
-
-              // Liquidate the head of the queue
-              const [next] =
-                prioritizedVaults.entriesPrioritizedGTE(quoteRatioPlusMargin);
-              if (next) {
-                yield next;
-              }
-            }
-          }
-          for await (const next of eventualLiquidations()) {
-            await facets.helper.liquidateAndRemove(next);
-            trace('price check liq', collateralBrand, next && next[0]);
-          }
-        },
-
-        /**
-         * @param {[key: string, vaultKit: Vault]} record
-         */
-        liquidateAndRemove([key, vault]) {
-          const { state, facets } = this;
-          const vaultSeat = vault.getVaultSeat();
-          trace('liquidating', collateralBrand, vaultSeat.getProposal());
-
-          const collateralPre = vault.getCollateralAmount();
-
-          // Start liquidation (vaultState: LIQUIDATING)
-          const liquidator = state.liquidator;
-          assert(liquidator);
-          liquidatingVaults.add(vault);
-          prioritizedVaults.removeVault(key);
-
-          return liquidate(
-            zcf,
-            vault,
-            liquidator,
-            collateralBrand,
-            factoryPowers.getGovernedParams().getLiquidationPenalty(),
-          )
-            .then(accounting => {
-              facets.manager.burnAndRecord(accounting.toBurn, vaultSeat);
-
-              // current values
-
-              // Sometimes, the AMM will sell less than all the collateral. If there
-              // was a shortfall, the investor doesn't keep the change, so we get it.
-              // If there was no shortfall, the collateral is returned.
-              const collateralPost = vault.getCollateralAmount();
-              if (
-                !AmountMath.isEmpty(collateralPost) &&
-                !AmountMath.isEmpty(accounting.shortfall)
-              ) {
-                // The borrower doesn't get the excess collateral remaining when
-                // liquidation results in a shortfall. We currently do nothing with
-                // it. We could hold it until it crosses some threshold, then sell it
-                // to the AMM, or we could transfer it to the reserve. At least it's
-                // visible in the accounting.
-                atomicTransfer(zcf, vaultSeat, retainedCollateralSeat, {
-                  Collateral: collateralPost,
-                });
-              }
-
-              // Reduce totalCollateral by collateralPre, since all the collateral was
-              // sold, returned to the vault owner, or held by the VaultManager.
-              state.totalCollateral = AmountMath.subtract(
-                state.totalCollateral,
-                collateralPre,
-              );
-              state.totalDebt = AmountMath.subtract(
-                state.totalDebt,
-                accounting.shortfall,
-              );
-
-              // cumulative values
-              state.totalProceedsReceived = AmountMath.add(
-                state.totalProceedsReceived,
-                accounting.proceeds,
-              );
-              state.totalOverageReceived = AmountMath.add(
-                state.totalOverageReceived,
-                accounting.overage,
-              );
-              state.totalShortfallReceived = AmountMath.add(
-                state.totalShortfallReceived,
-                accounting.shortfall,
-              );
-              liquidatingVaults.delete(vault);
-              trace('liquidated', collateralBrand);
-              state.numLiquidationsCompleted += 1;
-              facets.helper.updateMetrics();
-
-              if (!AmountMath.isEmpty(accounting.shortfall)) {
-                E(factoryPowers.getShortfallReporter())
-                  .increaseLiquidationShortfall(accounting.shortfall)
-                  .catch(reason =>
-                    console.error(
-                      'liquidateAndRemove failed to increaseLiquidationShortfall',
-                      reason,
-                    ),
-                  );
-              }
-            })
-            .catch(e => {
-              // XXX should notify interested parties
-              console.error('liquidateAndRemove failed with', e);
-              throw e;
-            });
-        },
       },
       manager: {
         getGovernedParams() {
@@ -779,20 +625,6 @@ export const prepareVaultManagerKit = (
           return factoryPowers.getGovernedParams();
         },
 
-        /**
-         * In extreme situations, system health may require liquidating all vaults.
-         * This starts the liquidations all in parallel.
-         */
-        async liquidateAll() {
-          const {
-            facets: { helper },
-          } = this;
-          const toLiquidate = Array.from(prioritizedVaults.entries()).map(
-            entry => helper.liquidateAndRemove(entry),
-          );
-          await Promise.all(toLiquidate);
-        },
-
         /**
          * @param {ZCFSeat} seat
          */
@@ -868,45 +700,6 @@ export const prepareVaultManagerKit = (
           }
         },
 
-        /**
-         *
-         * @param {Installation} liquidationInstall
-         * @param {object} liquidationTerms
-         */
-        async setupLiquidator(liquidationInstall, liquidationTerms) {
-          const { state, facets } = this;
-          const { ammPublicFacet, reservePublicFacet } = zcf.getTerms();
-          const zoe = zcf.getZoeService();
-          const collateralIssuer = zcf.getIssuerForBrand(collateralBrand);
-          const debtIssuer = zcf.getIssuerForBrand(debtBrand);
-          trace('setup liquidator', collateralBrand, {
-            debtBrand,
-            debtIssuer,
-            collateralBrand,
-            liquidationTerms,
-          });
-          const { creatorFacet, instance } = await E(zoe).startInstance(
-            liquidationInstall,
-            harden({ Minted: debtIssuer, Collateral: collateralIssuer }),
-            harden({
-              ...liquidationTerms,
-              amm: ammPublicFacet,
-              debtBrand,
-              reservePublicFacet,
-              priceAuthority,
-              timerService,
-            }),
-          );
-          trace('setup liquidator complete', collateralBrand, {
-            instance,
-            old: state.liquidatorInstance,
-            equal: state.liquidatorInstance === instance,
-          });
-          state.liquidatorInstance = instance;
-          state.liquidator = creatorFacet;
-          facets.helper.assetNotify();
-        },
-
         async getCollateralQuote() {
           // get a quote for one unit of the collateral
           return E(priceAuthority).quoteGiven(collateralUnit, debtBrand);
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/AttackersGuide.md b/packages/inter-protocol/src/vpool-xyk-amm/AttackersGuide.md
deleted file mode 100644
index 59909fe5461..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/AttackersGuide.md
+++ /dev/null
@@ -1,89 +0,0 @@
-# An Attacker's guide to the Constant Product AMM
-
-This is an incomplete list of potential weak points that an attacker might want to focus
-on when looking for ways to violate the integrity of the AMM. It's here to help defenders,
-as "attacker's mindset" is a good way to focus attention for the defender. The list should
-correspond pretty closely to the set of assurances that the AMM aims to support.
-
-The main guarantee that an
-[Automated Market Maker](https://mason.gmu.edu/~rhanson/mktscore.pdf) makes is that
-sufficiently liquid pools will always retain enough collateral through any sequence of
-trades to be able to continue trading. The caveat just means that when the amount of
-liquidity in the pool is quite small with respect to desired trades, trades will quickly
-push the balance to extreme enough prices that no further trading will take place. If the
-pool is liquid enough, trades will push the price enough out of equilibrium that it will
-be very attractive for arbitrageurs to restore the price. Anything that allows traders or
-liquidity providers to violate that expectation is a problem.
-
-## Multiple Pools
-
-`addPool` and `addLiquidity` are publicly available. That means someone could maliciously
-create pools or provide insufficient liquidity. The requirement of a minimum initial
-liquidity should be enough to prevent misuse of these APIs from hurting us.
-
-Since `addPool` is public, someone could add a look-alike issuer for a well-known
-currency and make it harder for people to find the pool they intend to trade with. As
-long as people are dealing wiht Brands and Issuers, they shouldn't be confused by
-this. Does the Wallet UI provide enough clarity in the face of this?
-
-Zoe holds the collaterral for all the pools in common. We segragate it by Pool, so each
-pool's allocation includes some IST (the central currency) and some of another
-collateral. The doublePool trades move IST between pools, but Zoe's rights conservation
-enforcement ensure that none is ever gained or lost.
-
-## Fees
-
-Fees are collected as trading takes place, and kept in a distinct Zoe seat. The creator of
-the AMM should be the only one who can collect the fees. Can that invitation be hijacked
-from whoever gets that facet during bootstrap?  Is there another way to steal fees?
-
-Can users structure trades so they can pay less in fees than intended?
-
-## Providing Liquidity
-
-Traders can provide liquidity and get liquidity tokens for a particular pool. The goal is
-that they earn a share of the fees that were collected while their liquidity remained in
-the pool. Can liquidity providers gain extra fees over other providers, or can they cause
-traders to be disadvantaged?
-
-Can liquidity providers extact more from the pool than they should be able to?
-
-## Math
-
-The whole design is predicated on the X*Y=K invariant.  That invariant says that trading
-should not change the product of X and Y, but in actuality, roundoff and fees are both
-allowed to change the product. Roundoff should increase it ever so slightly, except in
-cases where there are small amounts in the pool, where it can be significant. Fees are
-added to the pool, so they change the size of the pool, but should be interpreted as
-taking place after the trade rebalances the amounts. The equations are explained in detail
-in `constantProduct/README.md`.
-
-Adding liquidity adds funds to both pools so, of course, it changes X and Y. But (except
-in the case of `AddLiquidityAtRate`), it should keep X and Y in the same proportion.
-
-I don't know whether anyone else has done an implementation of the multi-pool swap that
-works like ours. If neither X nor Y is IST, then we trade X for IST and IST for
-Y. Attributing fees in this case took some art. This is also addressed in
-`constantProduct/README.md`.
-
-Adding liquidity while changing the ratio of assets is done in two steps in order to
-prevent people from using a single step as a way to avoid fees on trades. Users shouldn't
-be able to use `AddLiquidityAtRate` to avoid paying fees on what is effectively a trade.
-
-
-## Economics
-
-The Inter Protocol mechanism is envisioned as a major provider of liquidity. It may leave
-its liquidity in the pool over the long term, and never or seldom collect earnings. Does
-this affect prices or trading volumes adverselyj? (More liquidity is expected to provide
-better prices for traders, so this would be a surprise.)
-
-Other constant product markets have performed reasonably well through periods of high
-volatillity. Is there any reason to expect the design variations we've introduced to have
-trouble where others did not?
-
-## Governance
-
-The poolFee and protocolFee can be changed by governance. Can unauthorized parties
-interfere with this? Is there any hazard here beyond the possibility that the holders of
-this power might raise rates more than some users would be happy with?
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js b/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js
deleted file mode 100644
index 70532815320..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/addLiquidity.js
+++ /dev/null
@@ -1,221 +0,0 @@
-import {
-  assertProposalShape,
-  calcSecondaryRequired,
-  natSafeMath,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import { AmountMath } from '@agoric/ertp';
-
-import '@agoric/zoe/exported.js';
-
-const { Fail, quote: q } = assert;
-
-const { add, multiply } = natSafeMath;
-/**
- * @param {ZCF} zcf
- * @param {(brand: Brand) => XYKPool} getPool
- */
-const makeMakeAddLiquidityInvitation = (zcf, getPool) => {
-  const addLiquidity = seat => {
-    assertProposalShape(seat, {
-      give: {
-        Central: null,
-        Secondary: null,
-      },
-    });
-
-    // Get the brand of the secondary token so we can identify the liquidity pool.
-    const secondaryBrand = seat.getProposal().give.Secondary.brand;
-    const pool = getPool(secondaryBrand);
-    const liquidityIssuer = pool.getLiquidityIssuer();
-    const liquidityBrand = zcf.getBrandForIssuer(liquidityIssuer);
-    seat.getProposal().want.Liquidity.brand === liquidityBrand ||
-      Fail`liquidity brand must be ${q(liquidityBrand)}`;
-
-    return pool.addLiquidity(seat);
-  };
-
-  const makeAddLiquidityInvitation = () =>
-    zcf.makeInvitation(addLiquidity, 'multipool amm add liquidity');
-
-  return makeAddLiquidityInvitation;
-};
-
-// The desired ratio requires a wider range than K would support.
-const imbalancedRequest = (desiredRatio, startK) => {
-  if (desiredRatio > 1.0) {
-    return desiredRatio > Number(startK);
-  } else {
-    return Number(startK) * desiredRatio < 1n;
-  }
-};
-harden(imbalancedRequest);
-// exported for testing only
-export { imbalancedRequest };
-
-/**
- * The pool has poolX and poolY currently. The user wants to add liquidity of
- * giveX and giveY, but the ratios are probably not the same. We want to adjust
- * the pool to have the ratio (poolX + giveX) / (poolY + giveY), without
- * changing K, the product of the two sides.
- *
- * Calculate targetX and targetY, which multiply to the same product as
- * poolX * poolY, but are in the ratio we'll end at. From this we can produce
- * a proposed trade that maintains K, but changes the ratio, so we can add
- * liquidity at the desired ratio.
- *
- * endX = poolX + giveX;   endY = poolY + giveY
- * desiredRatio = endX / endY
- * targetY = sqrt(startK / desiredRatio)
- * targetX = desiredRatio * targetY
- *   so targetK equals startK because we square targetY
- * targetK = targetX * targetY = desiredRatio * (startK / desiredRatio)
- *
- * Since startK/endK is less than one, and we have to worry about early loss of
- * precision, we round and convert to bigint as the last step
- *
- * If the desired ratio (the ratio of the sums of contributed amounts and pool
- * balances) is larger than K (which most often happens when the pool balances
- * are small) we somewhat arbitrarily refuse the transaction.
- * For instance, if the desired ratio is 1000:1 because one currency uses 12
- * digits and the other 9, and the pool has single digits of liquidity, then
- * it would be better to manually adjust rather than using this approach.
- *
- * @param {Amount<'nat'>} poolX
- * @param {Amount<'nat'>} poolY
- * @param {Amount<'nat'>} giveX
- * @param {Amount<'nat'>} giveY
- * @returns {{targetX: Amount<'nat'>, targetY: Amount<'nat'> }}
- */
-export const balancesToReachRatio = (poolX, poolY, giveX, giveY) => {
-  const startK = multiply(poolX.value, poolY.value);
-  const endX = add(poolX.value, giveX.value);
-  const endY = add(poolY.value, giveY.value);
-  const desiredRatio = Number(endX) / Number(endY);
-
-  if (imbalancedRequest(desiredRatio, startK)) {
-    return {
-      targetX: AmountMath.makeEmpty(poolX.brand),
-      targetY: AmountMath.makeEmpty(poolY.brand),
-    };
-  }
-  const targetY = Math.sqrt(Number(startK) / desiredRatio);
-  const targetX = targetY * desiredRatio;
-
-  return {
-    targetX: AmountMath.make(poolX.brand, BigInt(Math.trunc(targetX))),
-    targetY: AmountMath.make(poolY.brand, BigInt(Math.trunc(targetY))),
-  };
-};
-
-/**
- * @param {ZCF} zcf
- * @param {(b: Brand) => XYKPool} getPool
- * @param {(i: Brand) => VirtualPool} provideVPool
- * @param {ZCFSeat} feeSeat
- * @param {(b: Brand) => PoolFacets['helper']} getPoolHelper
- */
-const makeMakeAddLiquidityAtRateInvitation = (
-  zcf,
-  getPool,
-  provideVPool,
-  feeSeat,
-  getPoolHelper,
-) => {
-  const addLiquidityAtRate = seat => {
-    assertProposalShape(seat, {
-      give: {
-        Central: null,
-        Secondary: null,
-      },
-      want: { Liquidity: null },
-    });
-
-    const giveAlloc = seat.getProposal().give;
-    /** @type {Amount<'nat'>} */
-    const secondaryAmount = giveAlloc.Secondary;
-    const secondaryBrand = secondaryAmount.brand;
-    const centralBrand = giveAlloc.Central.brand;
-    const pool = getPool(secondaryBrand);
-    // Step 1: trade to adjust the pool's price
-    //   A  figure out the ratio of the inputs
-    //   B  figure out how X*Y changes to reach that ratio (ignoring fees)
-    const centralPoolAmount = pool.getCentralAmount();
-    const secondaryPoolAmount = pool.getSecondaryAmount();
-
-    if (
-      AmountMath.isEmpty(centralPoolAmount) &&
-      AmountMath.isEmpty(secondaryPoolAmount)
-    ) {
-      return pool.addLiquidity(seat);
-    }
-
-    const { targetX: newCentral, targetY: newSecondary } = balancesToReachRatio(
-      centralPoolAmount,
-      secondaryPoolAmount,
-      giveAlloc.Central,
-      giveAlloc.Secondary,
-    );
-
-    const vPool = provideVPool(secondaryBrand);
-    const poolSeat = pool.getPoolSeat();
-    const transferForTrade = (prices, incrementKey, decrementKey) => {
-      seat.decrementBy(harden({ [incrementKey]: prices.swapperGives }));
-      poolSeat.decrementBy(harden({ [decrementKey]: prices.yDecrement }));
-      seat.incrementBy(harden({ [decrementKey]: prices.swapperGets }));
-      feeSeat.incrementBy(harden({ Fee: prices.protocolFee }));
-      poolSeat.incrementBy(harden({ [incrementKey]: prices.xIncrement }));
-    };
-
-    //   1C  Stage the changes for the trade
-    if (AmountMath.isGTE(newCentral, centralPoolAmount)) {
-      const prices = vPool.getPriceForOutput(
-        AmountMath.makeEmpty(centralBrand),
-        AmountMath.subtract(secondaryPoolAmount, newSecondary),
-      );
-      transferForTrade(prices, 'Central', 'Secondary');
-    } else {
-      const prices = vPool.getPriceForInput(
-        AmountMath.subtract(newSecondary, secondaryPoolAmount),
-        AmountMath.makeEmpty(centralBrand),
-      );
-      transferForTrade(prices, 'Secondary', 'Central');
-    }
-
-    // Step 2: add remaining liquidity
-    const stagedAllocation = poolSeat.getStagedAllocation();
-    const centralPoolAfterTrade = stagedAllocation.Central;
-    const secondaryPoolAfterTrade = stagedAllocation.Secondary;
-    const userAllocation = seat.getStagedAllocation();
-
-    const secondaryRequired = AmountMath.make(
-      secondaryBrand,
-      calcSecondaryRequired(
-        userAllocation.Central.value,
-        centralPoolAfterTrade.value,
-        secondaryPoolAfterTrade.value,
-        userAllocation.Secondary.value,
-      ),
-    );
-
-    return getPoolHelper(secondaryBrand).addLiquidityActual(
-      pool,
-      seat,
-      secondaryRequired,
-      poolSeat.getStagedAllocation().Central,
-      feeSeat,
-    );
-  };
-
-  const makeAddLiquidityInvitation = () =>
-    zcf.makeInvitation(
-      addLiquidityAtRate,
-      'multipool amm add liquidity at rate',
-    );
-
-  return makeAddLiquidityInvitation;
-};
-
-harden(makeMakeAddLiquidityInvitation);
-harden(makeMakeAddLiquidityAtRateInvitation);
-
-export { makeMakeAddLiquidityInvitation, makeMakeAddLiquidityAtRateInvitation };
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/addPool.js b/packages/inter-protocol/src/vpool-xyk-amm/addPool.js
deleted file mode 100644
index 5e0214b7aec..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/addPool.js
+++ /dev/null
@@ -1,200 +0,0 @@
-import { E } from '@endo/eventual-send';
-import { AmountMath, AssetKind } from '@agoric/ertp';
-import {
-  assertProposalShape,
-  atomicTransfer,
-} from '@agoric/zoe/src/contractSupport/index.js';
-
-import { definePoolKind } from './pool.js';
-
-const { quote: q, Fail } = assert;
-
-const DISPLAY_INFO = harden({ decimalPlaces: 6 });
-
-/** @typedef {import('@agoric/vat-data').Baggage} Baggage */
-
-/**
- * @param {ZCF} zcf
- * @param {(Brand) => boolean} isInSecondaries
- * @param {import('@agoric/store/src/stores/store-utils.js').AtomicProvider<Brand<'nat'>, ZCFMint<'nat'>>} brandToLiquidityMintProvider
- * @param {() => (secondaryBrand: Brand<'nat'>) => Promise<void>} getAddIssuerToReserve
- */
-export const makeAddIssuer = (
-  zcf,
-  isInSecondaries,
-  brandToLiquidityMintProvider,
-  getAddIssuerToReserve,
-) => {
-  /**
-   * Add a new issuer. If we previously received a request for the same issuer,
-   * we'll return the issuer or a promise for it.
-   *
-   * @param {import('./pool.js').MethodContext} _context
-   * @param {Issuer<'nat'>} secondaryIssuer
-   * @param {string} keyword
-   */
-  const addIssuer = async (_context, secondaryIssuer, keyword) => {
-    const [secondaryAssetKind, secondaryBrand] = await Promise.all([
-      E(secondaryIssuer).getAssetKind(),
-      E(secondaryIssuer).getBrand(),
-    ]);
-    // AWAIT ///////////////
-    secondaryAssetKind === AssetKind.NAT ||
-      Fail`${q(keyword)} asset not fungible (must use NAT math)`;
-
-    /** @type {(brand: Brand<'nat'>) => Promise<ZCFMint<'nat'>>} */
-    const makeLiquidityMint = brand => {
-      !isInSecondaries(brand) ||
-        Fail`issuer ${secondaryIssuer} already has a pool`;
-
-      const liquidityKeyword = `${keyword}Liquidity`;
-      zcf.assertUniqueKeyword(liquidityKeyword);
-
-      return E.when(
-        Promise.all([
-          zcf.saveIssuer(secondaryIssuer, keyword),
-          zcf.makeZCFMint(liquidityKeyword, AssetKind.NAT, DISPLAY_INFO),
-        ]),
-        ([issuer, mint]) => {
-          console.log(
-            `Saved issuer ${secondaryIssuer} to keyword ${keyword} and got back ${issuer}`,
-          );
-          return mint;
-        },
-      ).catch(e => {
-        console.error(
-          `Failure Saving issuer ${secondaryIssuer}. Not added to Reserve`,
-        );
-        throw e;
-      });
-    };
-
-    /** @type {(brand: Brand<'nat'>) => Promise<void>} */
-    const finish = brand => {
-      // defer lookup until necessary. more aligned with governed
-      // param we expect this to be eventually.
-      const addIssuerToReserve = getAddIssuerToReserve();
-
-      // tell the reserve about this brand, which it will validate by
-      // calling back to AMM for the issuer
-      return addIssuerToReserve(brand);
-    };
-
-    return brandToLiquidityMintProvider
-      .provideAsync(secondaryBrand, makeLiquidityMint, finish)
-      .then(mint => mint.getIssuerRecord().issuer);
-  };
-
-  return addIssuer;
-};
-
-/**
- * @param {Baggage} baggage
- * @param {import('./multipoolMarketMaker.js').AmmPowers} ammPowers
- * @param {(secondaryBrand: Brand, reserveLiquidityTokenSeat: ZCFSeat, liquidityKeyword: Keyword) => Promise<void>} onOfferHandled
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
- */
-export const makeAddPoolInvitation = (
-  baggage,
-  ammPowers,
-  onOfferHandled,
-  storageNode,
-  marshaller,
-) => {
-  const { zcf } = ammPowers;
-  const makePool = definePoolKind(baggage, ammPowers, storageNode, marshaller);
-
-  /** @type {(Brand) => Promise<{poolFacets: PoolFacets, liquidityZcfMint: ZCFMint}>} */
-  const addPool = async secondaryBrand => {
-    const liquidityZcfMint =
-      ammPowers.secondaryBrandToLiquidityMint.get(secondaryBrand);
-
-    const { zcfSeat: poolSeat } = ammPowers.zcf.makeEmptySeatKit();
-    const poolFacets = makePool(liquidityZcfMint, poolSeat, secondaryBrand);
-
-    ammPowers.secondaryBrandToPool.init(secondaryBrand, poolFacets);
-    return { liquidityZcfMint, poolFacets };
-  };
-
-  /** @param {ZCFSeat} seat */
-  const handleAddPoolOffer = async seat => {
-    assertProposalShape(seat, {
-      give: { Central: null, Secondary: null },
-    });
-
-    const {
-      give: { Central: centralAmount, Secondary: secondaryAmount },
-      want: proposalWant,
-    } = seat.getProposal();
-    const secondaryBrand = secondaryAmount.brand;
-
-    const { brand: liquidityBrand, issuer } =
-      ammPowers.secondaryBrandToLiquidityMint
-        .get(secondaryBrand)
-        .getIssuerRecord();
-
-    /** @type {Amount<'nat'>} */
-    // @ts-expect-error cast governance types
-    const minPoolLiquidity = ammPowers.params.getMinInitialPoolLiquidity();
-
-    if (proposalWant.Liquidity) {
-      const { Liquidity: wantLiquidityAmount } = proposalWant;
-      const centralAboveMinimum =
-        // @ts-expect-error central is NAT
-        centralAmount.value - minPoolLiquidity.value;
-      // when providing initial liquidity, the liquidity tokens issued will be
-      // equal to the central provided. Here, the reserve gets the minimum
-      const funderLiquidityAmount = AmountMath.make(
-        liquidityBrand,
-        centralAboveMinimum,
-      );
-      AmountMath.isGTE(funderLiquidityAmount, wantLiquidityAmount) ||
-        Fail`Requested too many liquidity tokens (${wantLiquidityAmount}, max: ${funderLiquidityAmount}`;
-    }
-    AmountMath.isGTE(centralAmount, minPoolLiquidity) ||
-      Fail`The minimum initial liquidity is ${minPoolLiquidity}, rejecting ${centralAmount}`;
-    const minLiqAmount = AmountMath.make(
-      liquidityBrand,
-      minPoolLiquidity.value,
-    );
-
-    // @ts-expect-error find might return undefined
-    const [liquidityKeyword] = Object.entries(zcf.getTerms().issuers).find(
-      ([_, i]) => i === issuer,
-    );
-    assert(liquidityKeyword, 'liquidity brand required');
-
-    // COMMIT POINT /////////////////////
-
-    const {
-      poolFacets: { pool, helper },
-    } = await addPool(secondaryBrand);
-
-    // in addLiquidityInternal, funder provides centralAmount & secondaryAmount,
-    // and receives liquidity tokens equal to centralAmount. Afterward, we'll
-    // transfer minPoolLiquidity in tokens from the funder to the reserve.
-    helper.addLiquidityInternal(seat, secondaryAmount, centralAmount);
-
-    const { zcfSeat: reserveLiquidityTokenSeat } = zcf.makeEmptySeatKit();
-    atomicTransfer(
-      zcf,
-      seat,
-      reserveLiquidityTokenSeat,
-      { Liquidity: minLiqAmount },
-      { [liquidityKeyword]: minLiqAmount },
-    );
-
-    seat.exit();
-    pool.updateState();
-
-    await onOfferHandled(
-      secondaryBrand,
-      reserveLiquidityTokenSeat,
-      liquidityKeyword,
-    );
-    return 'Added liquidity.';
-  };
-
-  return () => zcf.makeInvitation(handleAddPoolOffer, 'Add Pool and Liquidity');
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/AMM-Trade.jpeg b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/AMM-Trade.jpeg
deleted file mode 100644
index 000fa005c44..00000000000
Binary files a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/AMM-Trade.jpeg and /dev/null differ
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/README.md b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/README.md
deleted file mode 100644
index d8ce32b3d9d..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/README.md
+++ /dev/null
@@ -1,204 +0,0 @@
-# Constant Product AMM
-
-A constant product automatic market maker based on our Ratio library. It charges
-two kinds of fees: a pool fee remains in the pool to reward the liquidity
-providers and a protocol fee is extracted to fund the economy. The external
-entry point is a call to `pricesForStatedInput()` or `pricesForStatedOutput()`.
-
-This algorithm uses the x*y=k formula directly, without fees. Briefly, there are
-two kinds of assets, whose values are kept roughly in balance through the
-actions of arbitrageurs. At any time a trader can trade with the pool by
-offering to deposit one of the two assets. They will receive an amount
-of the complementary asset that will maintain the invariant that the product of
-the balances doesn't decrease. (Rounding is done in favor of the
-pool.)
-
-The user can specify a maximum amount they want to pay or a minimum amount they
-want to receive. Unlike Uniswap, this approach will charge less than the user
-offered or pay more than they asked for when appropriate. By analogy, if a user
-is willing to pay up to $20 when the price of soda is $3 per bottle, it would
-give 6 bottles and only charge $18. (We refer to these as "improved" prices.)
-Uniswap doesn't adjust the provided price, so it would charge $20 in that trade.
-This matters whenever the values of the smallest unit of the currencies are
-significantly different, which is common in DeFi.
-
-The rules that drive the design include
-
-* When the user specifies an input (or output) price, they shouldn't pay more
-  (or receive less) than they said.
-* The pool fee is charged against the side not specified by the user (the
-  "computed side"). This increases the pool balance without impacting the amount
-  that the user specified.
-* The protocol fee is always charged in IST.
-* The fees are calculated based on the pool balances before the transaction.
-* Computations are rounded in favor of the pool.
-
-We start by estimating the exchange rate, and calculate fees based on that. Once
-we know the fees, we add or subtract them directly to the amounts added to and
-extracted from the pools to adhere to those rules.
-
-## Calculating fees
-
-In these tables BLD represents any collateral. The user can specify how much
-they want or how much they're willing to pay. We'll call the value they
-specified **sGive** or **sGet** and bold it. We'll always refer to the currency
-being added as X and the currency the user gets as Y. X and Y are the amounts
-used to maintain the constant product invariant. On every transaction the pool
-balance will also increase on one side or the other by the pool fee, and the
-protocol fee will be extracted outside the pool. So the amount produced is less
-(or the amount paid is more) because the invariant is maintained on the amounts
-remaining after fees have been charged. 
-
-In the final table, we'll see what the user pays or gets (sGet, sGive), how much
-the pool balances change (xIncr, yDecr) and the changes that impact the constant
-product calculation(&Delta;X, &Delta;Y). The amount paid and received by the
-trader and changes to the pool are calculated relative to &Delta;X and &Delta;Y
-so that the pool grows by the poolFee and the protocolFee can be paid from the
-proceeds.
-
-This table shows which brands the amounts each have, as well as what is computed
-vs. given. The PoolFee is computed based on the calculated amount (BLD in rows 1
-and 2; IST in rows 3 and 4). The Protocol fee is always in IST.
-
-|          | In (X) | Out (Y) | PoolFee | Protocol Fee | Specified | Computed |
-|---------|-----|-----|--------|-----|------|-----|
-| **IST in** | IST | BLD | BLD | IST | **sGive** | sGet |
-| **IST out** | BLD | IST | BLD | IST | **sGet** | sGive |
-| **BLD in** | BLD | IST | IST | IST | **sGive** | sGet |
-| **BLD out** | IST | BLD | IST | IST | **sGet** | sGive |
-
-We'll calculate how much the pool balances would change in the no-fee, improved
-price case using the constant product formulas. We call these results &delta;X,
-and &delta;Y. This table uses lower case &delta; to distinguish estimates from
-final values, which use capital &Delta;.
-
-The fees are based on &delta;X, and &delta;Y. &rho; is the poolFee (e.g., 30
-basis points). &phi; is the protocol fee (e.g., 6 basis points). The pool fee
-will be &rho; times whichever of &delta;X and &delta;Y was calculated. The
-protocol fee will be &phi; * &delta;X when IST is paid in, and &phi; * &delta;Y
-when BLD is paid in. (&alpha; and &beta; in this table are the no-fee versions.)
-
-|          | &delta;X | &delta;Y | PoolFee | Protocol Fee |
-|---------|-----|-----|--------|-----|
-| **IST in**  | **sGive** | y * &alpha; / (1 + &alpha;) | &rho; &times; &delta;Y | &phi; &times; **sGive** (= &phi; &times; &delta;X) |
-| **IST out** | x * &beta; / (1 - &beta;) | **sGet** | &rho; &times; &delta;X | &phi; &times; **sGet** (= &phi; &times; &delta;Y) |
-| **BLD in**  | **sGive**  | y * &alpha; / (1 + &alpha;) | &rho; &times; &delta;Y | &phi; &times; &delta;Y |
-| **BLD out** | x * &beta; / (1 - &beta;) | **sGet** | &rho; &times; &delta;X | &phi; &times; &delta;X |
-
-In rows 1 and 3, **sGive** was specified and sGet will be calculated. In rows 2
-and 4, **sGet** was specified and sGive will be calculated. Once we know the
-fees, we can add or subtract the fees and calculate the pool changes.
-
-The next table shows how the amount added to and subtracted from the pool (xIncr
-and yIncr) differs from what the trader gives or gets and the change in the pool
-values. While X' and Y' are the values resulting from the constant product
-formula, xHat and yHat are the new values in the pool, reflecting the
-contribution of the pool fee. From the diagram, xIncr is the difference between
-X and xHat, while yIncr is the difference between Y and yHat.
-
-The protocol fee (&phi;) is always charged on the IST side, and doesn't go in
-the pool. The pool fee (&rho;) is charged on the amount that is calculated
-(&Delta;X or &Delta;Y) and is included in yHat. 
-
-We use the estimate of the amount in or out to calculate improved values of
-&Delta;X and &Delta;Y. These values tell us how much the trader will pay, the
-changes in pool balances, and what the trader will receive. As before, &Delta;X
-reflects a balance that will be growing, and &Delta;Y one that will be
-shrinking.
-
-![AMM Diagram](./AMM-Trade.jpeg)
-
-When IST is specified (in or out), we adjust by the protocol Fee to get the
-change to the IST balance (which gives X' or Y'); use that to calculate the
-BLD component of the constant product, and then adjust &delta; by the pool fee.
-When BLD is specified, the entire amount will affect the pool balance (so the
-value in the constant product formula is the final BLD balance.) Both the pool
-and protocol fees are charged in IST so they respectively reduce sGet or
-increase sGive. 
-
-This table shows how the pool's growth and trader's values differ from the
-amounts that match the constant product formula. X is in IST on lines 1 and 4,
-and BLD on lines 2 and 3. 
-
-|          | xIncr | yDecr | pay In (sGive) | pay Out (sGet) |
-|---------|-----|-----|-----|-----|
-| **IST in**  | &Delta;X | &Delta;Y - PoolFee | &Delta;X + protocolFee | &Delta;Y - PoolFee |
-| **IST out**  | &Delta;X + PoolFee | &Delta;Y | &Delta;X + protocolFee + PoolFee | &Delta;Y |
-| **BLD in**  | &Delta;X | &Delta;Y - PoolFee | &Delta;X + ProtocolFee | &Delta;Y - PoolFee |
-| **BLD out**  | &Delta;X + PoolFee | &Delta;Y | &Delta;X + PoolFee + ProtocolFee | &Delta;Y |
-
-In the two right columns the protocolFee is either added to the amount the
-trader pays, or subtracted from the proceeds. The poolFee does the same on the
-left side, and it is either added to the amount deposited in the pool (xIncr)
-or deducted from the amount removed from the pool (yDecr).
-
-
-* line 1: the trader provides **sGive** IST; the pool will gain that minus
-  the protocol fee in IST. The value in the IST pool after (X') will be used to
-  calculate Y'.  The pool fee is calculated from &delta;Y and the trader gets
-  &deltaY; - poolFee
-* line 2: the trader asked for **sGet** IST; the pool will be reduced by that
-  amount plus the protocol fee. Y' will be used to calculate X'. The trader
-  must provide &deltaX; plus poolFee
-* Line 3: the trader pays **sGive** BLD; the pool will increase by that minus
-  both fees
-* line 4: the trader specified **sGet** BLD; the pool will be reduced by that
-  plus the protocol fee.
-
-
-## Example
-
-For example, let's say the pool has 40,000,000 IST and 3,000,000 BLD. Alice
-requests a swapIn with inputAmount of 30,000 IST, and outputAmount of 2000 BLD.
-(SwapIn means the inputValue is the basis of the computation, while outputAmount
-is treated as a minimum). To make the numbers concrete, we'll say the pool fee
-is 25 Basis Points, and the protocol fee is 5 Basis Points.
-
-The first step is to compute the trade that would take place with no fees. 30K
-will be added to 40M IST. To keep the product just above 120MM, the BLD will be
-reduced to 2,997,752.
-
-```
-40,030,000 * 2,997,752 > 40,000,000 * 3,000,000 > 40,030,000 * 2,997,751
-   120000012560000     >    120000000000000     >   119999972530000
-```
-
-But we get an even tighter bound by reducing the amount Alice has to spend
-
-```
-40,029,996 * 2,997,752 > 40,000,000 * 3,000,000 > 40,029,995 * 2,997,752
-    120000000568992    >    120000000000000     >   119999997571240
-```
-
-The initial price estimate is that 29,996 IST would get 2248 BLD in a no-fee
-pool. We base fees on this estimate, so the **protocol Fee will be 15 IST**
-(always in IST, &lceil;29,996 * 0.0005&rceil;) and the **pool fee will be 6 BLD**
-(in the computed side, &lceil;2248 * 0.0025&rceil;).  The "computed side" for
-`swapIn` is output and for `swapOut` is input.
-
-Now we calculate the actual &Delta;X and &Delta;Y, since the fees affect the
-size of the changes to the pool. From the first row of the third table we see
-that the calculation starts from &Delta;X of
-`sGive - ProtocolFee (i.e. 30,000 - 15 = 29,985)`
-
-```
-40,029,985 * 2,997,753 > 40,000,000 * 3,000,000 > 40,029,985 * 2,997,752
-```
-
-and knowing that 2,997,753 BLD must remain in the pool, we refine the required
-amount of IST:
-
-```
-40,029,983 * 2,997,753 > 40,000,000 * 3,000,000 > 40,029,982 * 2,997,753
-```
-
-**&Delta;X is 29,983, and &Delta;Y is 2247**.
-
- * Alice pays &Delta;X + protocolFee, which is 29,983 + 15  (29998 IST)
- * Alice will receive &Delta;Y - PoolFee which is 2247 - 6  (2241 BLD)
- * The IST in the pool will increase by &Delta;X   (29983 IST)
- * The BLD in the pool will decrease by &Delta;Y   (2247 BLD)
-
-The Pool grew by 6 BLD more than was required to maintain the constant product
-invariant. 15 IST were extracted for the protocol fee.
-
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js
deleted file mode 100644
index 9d661c2b34a..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcFees.js
+++ /dev/null
@@ -1,93 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-import {
-  ceilMultiplyBy,
-  makeRatio,
-} from '@agoric/zoe/src/contractSupport/ratio.js';
-
-import './types.js';
-import './internal-types.js';
-
-import { BASIS_POINTS } from './defaults.js';
-
-const { Fail } = assert;
-
-/**
- * Make a ratio given a nat representing basis points and a brand.
- *
- * @type {MakeFeeRatio}
- */
-const makeFeeRatio = (feeBP, brandOfFee) =>
-  makeRatio(feeBP, brandOfFee, BASIS_POINTS);
-
-/** @type {Maximum} */
-const maximum = (left, right) => {
-  // If left is greater or equal, return left. Otherwise return right.
-  return AmountMath.isGTE(left, right) ? left : right;
-};
-
-/** @type {AmountGT} */
-const amountGT = (left, right) =>
-  AmountMath.isGTE(left, right) && !AmountMath.isEqual(left, right);
-
-/**
- * Apply the feeRatio to the amount that has a matching brand. This used to
- * calculate fees in the single pool case.
- *
- * @param {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>}} amounts - a record with two
- *   amounts in different brands.
- * @param {Ratio} feeRatio
- * @returns {Amount<'nat'>}
- */
-const calcFee = ({ amountIn, amountOut }, feeRatio) => {
-  feeRatio.numerator.brand === feeRatio.denominator.brand ||
-    Fail`feeRatio numerator and denominator must use the same brand ${feeRatio}`;
-
-  let sameBrandAmount;
-  if (amountIn.brand === feeRatio.numerator.brand) {
-    sameBrandAmount = amountIn;
-  } else if (amountOut.brand === feeRatio.numerator.brand) {
-    sameBrandAmount = amountOut;
-  } else {
-    throw Fail`feeRatio's brand (${feeRatio.numerator.brand}) must match one of the amounts [${amountIn}, ${amountOut}].`;
-  }
-
-  // Always round fees up
-  const fee = ceilMultiplyBy(sameBrandAmount, feeRatio);
-
-  // Fee cannot exceed the amount on which it is levied
-  AmountMath.isGTE(sameBrandAmount, fee) ||
-    Fail`The feeRatio can't be greater than 1 ${feeRatio}`;
-
-  return fee;
-};
-
-/**
- * Estimate the swap values, then calculate fees. The swapFn provided by the
- * caller will be swapInNoFees or swapOutNoFees.
- * SwapOut.
- *
- * @type {CalculateFees}
- */
-const calculateFees = (
-  amountGiven,
-  poolAllocation,
-  amountWanted,
-  protocolFeeRatio,
-  poolFeeRatio,
-  swapFn,
-) => {
-  // Get a rough estimation in both brands of the amount to be swapped
-  const estimation = swapFn({ amountGiven, poolAllocation, amountWanted });
-
-  const protocolFee = calcFee(estimation, protocolFeeRatio);
-  const poolFee = calcFee(estimation, poolFeeRatio);
-
-  return harden({ protocolFee, poolFee, ...estimation });
-};
-
-harden(amountGT);
-harden(maximum);
-harden(makeFeeRatio);
-harden(calculateFees);
-
-export { amountGT, maximum, makeFeeRatio, calculateFees };
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js
deleted file mode 100644
index 3deef9c0427..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Far } from '@endo/marshal';
-
-import { swap } from './swap.js';
-import { assertKInvariantSellingX } from './invariants.js';
-import { getXY } from './getXY.js';
-import { swapInNoFees, swapOutNoFees } from './core.js';
-
-// pricesForStatedOutput() and pricesForStatedInput are the external entrypoints
-// to the constantProduct module. The amountWanted is optional for
-// pricesForStatedInput and amountgiven is optional for pricesForStatedOutput.
-
-// The two methods call swap, passing in different functions for noFeeSwap.
-// pricesForStatedInput uses swapInNoFees, while pricesForStatedOutput uses
-// swapOutNoFees. the noFeesSwap functions
-const makeCalcSwapPrices = noFeesSwap => {
-  return Far(
-    'calcSwapPrices',
-    (
-      amountGiven,
-      poolAllocation,
-      amountWanted,
-      protocolFeeRatio,
-      poolFeeRatio,
-    ) => {
-      const result = swap(
-        amountGiven,
-        poolAllocation,
-        amountWanted,
-        protocolFeeRatio,
-        poolFeeRatio,
-        noFeesSwap,
-      );
-      const { x, y } = getXY({
-        amountGiven,
-        poolAllocation,
-        amountWanted,
-      });
-      assertKInvariantSellingX(x, y, result.xIncrement, result.yDecrement);
-      return result;
-    },
-  );
-};
-
-/** @type {CalcSwapInPrices} */
-const pricesForStatedInput = (
-  amountGiven,
-  poolAllocation,
-  amountWanted,
-  protocolFeeRatio,
-  poolFeeRatio,
-) => {
-  const calcSwapPrices = makeCalcSwapPrices(swapInNoFees);
-  return calcSwapPrices(
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  );
-};
-
-/** @type {CalcSwapOutPrices} */
-const pricesForStatedOutput = (
-  amountGiven,
-  poolAllocation,
-  amountWanted,
-  protocolFeeRatio,
-  poolFeeRatio,
-) => {
-  const calcSwapPrices = makeCalcSwapPrices(swapOutNoFees);
-  return calcSwapPrices(
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  );
-};
-
-harden(pricesForStatedInput);
-harden(pricesForStatedOutput);
-
-export { pricesForStatedOutput, pricesForStatedInput };
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js
deleted file mode 100644
index 0ed0790e7a5..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/core.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-
-import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
-import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/ratio.js';
-import { getXY } from './getXY.js';
-
-const { Fail } = assert;
-
-const assertSingleBrand = ratio => {
-  ratio.numerator.brand === ratio.denominator.brand ||
-    Fail`Ratio was expected to have same brand in numerator ${ratio.numerator.brand} and denominator ${ratio.denominator.brand}`;
-};
-
-/**
- * Multiply an amount by a ratio using floorDivide, ignoring the ratio's brands
- * in favor of the amount brand. This is necessary because the ratio is produced
- * by dividing assets of the opposite brand.
- *
- * @param {Amount<'nat'>} amount
- * @param {Ratio} ratio
- * @returns {Amount<'nat'>}
- */
-const floorMultiplyKeepBrand = (amount, ratio) => {
-  assertSingleBrand(ratio);
-  const value = natSafeMath.floorDivide(
-    natSafeMath.multiply(amount.value, ratio.numerator.value),
-    ratio.denominator.value,
-  );
-  return AmountMath.make(amount.brand, value);
-};
-
-/**
- * Multiply an amount and a ratio using ceilDivide, ignoring the ratio's brands
- * in favor of the amount brand. This is necessary because the ratio is produced
- * by dividing assets of the opposite brand.
- *
- * @param {Amount<'nat'>} amount
- * @param {Ratio} ratio
- * @returns {Amount<'nat'>}
- */
-const ceilMultiplyKeepBrand = (amount, ratio) => {
-  assertSingleBrand(ratio);
-  const value = natSafeMath.ceilDivide(
-    natSafeMath.multiply(amount.value, ratio.numerator.value),
-    ratio.denominator.value,
-  );
-  return AmountMath.make(amount.brand, value);
-};
-
-/**
- * Calculate deltaY when the user is selling brand X. That is, whichever asset
- * the user is selling, this function is used to calculate the change in the
- * other asset, i.e. how much of brand Y to give the user in return.
- * swapOutImproved calls this function with the calculated amountIn to find out
- * if more than the wantedAmountOut can be gained for the necessary amountIn.
- *
- * deltaY = (deltaXOverX/(1 + deltaXOverX))*y
- * Equivalently: (deltaX / (deltaX + x)) * y
- *
- * @param {Amount<'nat'>} x - the amount of Brand X in pool
- * @param {Amount<'nat'>} y - the amount of Brand Y the pool
- * @param {Amount<'nat'>} deltaX - the amount of Brand X to be added
- * @returns {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
- */
-export const calcDeltaYSellingX = (x, y, deltaX) => {
-  const deltaXPlusX = AmountMath.add(deltaX, x);
-  const xRatio = makeRatioFromAmounts(deltaX, deltaXPlusX);
-  // We want to err on the side of the pool, so this will use floorDivide to
-  // round down the amount paid out.
-  return floorMultiplyKeepBrand(y, xRatio);
-};
-
-/**
- * Calculate deltaX when the user is selling brand X. That is, whichever asset
- * the user is selling, this function is used to calculate the change to the
- * pool for that asset. swapInReduced calls this with the calculated amountOut
- * to find out if less than the offeredAmountIn would be sufficient.
- *
- * deltaX = (deltaYOverY/(1 - deltaYOverY))*x
- * Equivalently: (deltaY / (Y - deltaY )) * x
- *
- * @param {Amount<'nat'>} x - the amount of Brand X in the pool
- * @param {Amount<'nat'>} y - the amount of Brand Y in the pool
- * @param {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
- * @returns {Amount<'nat'>} deltaX - the amount of Brand X to be added
- */
-export const calcDeltaXSellingX = (x, y, deltaY) => {
-  const yMinusDeltaY = AmountMath.subtract(y, deltaY);
-  const yRatio = makeRatioFromAmounts(deltaY, yMinusDeltaY);
-  // We want to err on the side of the pool, so this will use ceilMultiply to
-  // round up the amount required.
-  return ceilMultiplyKeepBrand(x, yRatio);
-};
-
-/**
- * The input contains the amounts in the pool and a maximum amount offered.
- * Calculate the most beneficial trade that satisfies the constant product
- * invariant.
- *
- * @param {GetXYResultDeltaX} obj
- * @returns {ImprovedNoFeeSwapResult}
- */
-const swapInReduced = ({ x, y, deltaX: offeredAmountIn }) => {
-  const amountOut = calcDeltaYSellingX(x, y, offeredAmountIn);
-  const reducedAmountIn = calcDeltaXSellingX(x, y, amountOut);
-  AmountMath.isGTE(offeredAmountIn, reducedAmountIn) ||
-    Fail`The trade would have required ${reducedAmountIn} more than was offered ${offeredAmountIn}`;
-
-  return harden({
-    amountIn: reducedAmountIn,
-    amountOut,
-  });
-};
-
-/**
- * The input contains the amounts in the pool and the minimum amount requested.
- * Calculate the most beneficial trade that satisfies the constant product
- * invariant.
- *
- * @param {GetXYResultDeltaY} obj
- * @returns {ImprovedNoFeeSwapResult}
- */
-const swapOutImproved = ({ x, y, deltaY: wantedAmountOut }) => {
-  const amountIn = calcDeltaXSellingX(x, y, wantedAmountOut);
-  const improvedAmountOut = calcDeltaYSellingX(x, y, amountIn);
-  AmountMath.isGTE(improvedAmountOut, wantedAmountOut) ||
-    Fail`The trade would have returned ${improvedAmountOut} less than was wanted ${wantedAmountOut}`;
-
-  return harden({
-    amountIn,
-    amountOut: improvedAmountOut,
-  });
-};
-
-/** @type {NoFeeSwapFn} */
-export const swapInNoFees = ({ amountGiven, poolAllocation }) => {
-  const XY = getXY({ amountGiven, poolAllocation });
-  return swapInReduced(XY);
-};
-
-/** @type {NoFeeSwapFn} */
-export const swapOutNoFees = ({ poolAllocation, amountWanted }) => {
-  const XY = getXY({ poolAllocation, amountWanted });
-  return swapOutImproved(XY);
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js
deleted file mode 100644
index 90b8f0580a8..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/defaults.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const BASIS_POINTS = 10000n;
-export const DEFAULT_POOL_FEE = 24n; // 0.0024 or .24%
-export const DEFAULT_PROTOCOL_FEE = 6n; // .0006 or .06%
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js
deleted file mode 100644
index b94a70b9ea7..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/getXY.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// This does not support secondary to secondary. That has to happen at
-// a higher abstraction
-
-const { Fail } = assert;
-/**
- * The caller provides poolAllocation, which has balances for both Central and
- * Secondary, and at least one of amountGiven and amountWanted. getXY treats
- * the amountGiven as the X pool, and amountWanted as Y. It figures out which
- * way to pair up X and Y with Central and Secondary, and returns the pool
- * balances as X and Y and given and wanted as deltaX and deltaY
- * { X, Y, deltaX, deltaY }.
- *
- * @type {GetXY}
- */
-export const getXY = ({ amountGiven, poolAllocation, amountWanted }) => {
-  // Regardless of whether we are specifying the amountIn or the
-  // amountOut, the xBrand is the brand of the amountIn.
-  const xBrand = amountGiven && amountGiven.brand;
-  const yBrand = amountWanted && amountWanted.brand;
-  const secondaryBrand = poolAllocation.Secondary.brand;
-  const centralBrand = poolAllocation.Central.brand;
-  amountGiven ||
-    amountWanted ||
-    Fail`At least one of ${amountGiven} and ${amountWanted} must be specified`;
-
-  const deltas = {
-    deltaX: amountGiven,
-    deltaY: amountWanted,
-  };
-
-  if (secondaryBrand === xBrand || centralBrand === yBrand) {
-    // @ts-expect-error at least one of amountGiven and amountWanted is non-null
-    return harden({
-      x: poolAllocation.Secondary,
-      y: poolAllocation.Central,
-      ...deltas,
-    });
-  }
-  if (centralBrand === xBrand || secondaryBrand === yBrand) {
-    // @ts-expect-error at least one of amountGiven and amountWanted is non-null
-    return harden({
-      x: poolAllocation.Central,
-      y: poolAllocation.Secondary,
-      ...deltas,
-    });
-  }
-  assert.fail(`brand ${xBrand} was not recognized as Central or Secondary`);
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js
deleted file mode 100644
index 43fe9b6888f..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/internal-types.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * @typedef {object} ImprovedNoFeeSwapResult
- * @property {Amount<'nat'>} amountIn
- * @property {Amount<'nat'>} amountOut
- */
-
-/**
- * @typedef {object} FeePair
- *
- * @property {Amount<'nat'>} poolFee
- * @property {Amount<'nat'>} protocolFee
- */
-
-/**
- * @typedef {object} PoolAllocation
- *
- * @property {Amount<'nat'>} Central
- * @property {Amount<'nat'>} Secondary
- */
-
-/**
- * @typedef {object} NoFeeSwapFnInput
- * @property {Amount} amountGiven
- * @property {Amount} amountWanted
- * @property {Brand} [brand]
- * @property {PoolAllocation} poolAllocation
- */
-
-/**
- * This is the type for swapInNoFees and swapOutNoFees. pricesForStatedInput()
- * uses swapInNoFees, while pricesForStatedOutput() uses swapOutNoFees.
- *
- * @callback NoFeeSwapFn
- * @param {NoFeeSwapFnInput} input
- * @returns {ImprovedNoFeeSwapResult}
- */
-
-/**
- * @typedef {FeePair & ImprovedNoFeeSwapResult} FeeEstimate
- */
-
-/**
- * @callback CalculateFees
- * @param {Amount<'nat'>} amountGiven
- * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amountWanted
- * @param {Ratio} protocolFeeRatio
- * @param {Ratio} poolFeeRatio
- * @param {NoFeeSwapFn} swapFn
- * @returns {FeeEstimate}
- */
-
-/**
- * @callback InternalSwap
- * @param {Amount<'nat'>} amountGiven
- * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amountWanted
- * @param {Ratio} protocolFeeRatio
- * @param {Ratio} poolFeeRatio
- * @param {NoFeeSwapFn} swapFn
- * @returns {SinglePoolSwapResult}
- */
-
-/**
- * @callback CalcSwapInPrices
- * @param {Amount} amountGiven
- * @param {PoolAllocation} poolAllocation
- * @param {Amount} [amountWanted]
- * @param {Ratio} protocolFeeRatio
- * @param {Ratio} poolFeeRatio
- * @returns {SinglePoolSwapResult}
- */
-/**
- * @callback CalcSwapOutPrices
- * @param {Amount} [amountGiven]
- * @param {PoolAllocation} poolAllocation
- * @param {Amount} amountWanted
- * @param {Ratio} protocolFeeRatio
- * @param {Ratio} poolFeeRatio
- * @returns {SinglePoolSwapResult}
- */
-
-/**
- * @typedef {object} GetXYParam
- * @property {Amount} [amountGiven]
- * @property {PoolAllocation} poolAllocation
- * @property {Amount} [amountWanted]
- */
-
-/**
- * @typedef {object} GetXYResultDeltaX
- * @property {Amount<'nat'>} x
- * @property {Amount<'nat'>} y
- * @property {Amount<'nat'>} deltaX
- * @property {Amount<'nat'>|undefined} deltaY
- */
-
-/**
- * @typedef {object} GetXYResultDeltaY
- * @property {Amount<'nat'>} x
- * @property {Amount<'nat'>} y
- * @property {Amount<'nat'>} deltaY
- * @property {Amount<'nat'>|undefined} deltaX
- */
-
-/**
- * @typedef {GetXYResultDeltaX & GetXYResultDeltaY} GetXYResult
- */
-
-/**
- * @callback GetXY
- * @param {GetXYParam} obj
- * @returns {GetXYResult}
- */
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js
deleted file mode 100644
index 1a4101ca5cf..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/invariants.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Fail } from '@agoric/assert';
-import { AmountMath } from '@agoric/ertp';
-
-import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
-
-/**
- * xy <= (x + deltaX)(y - deltaY)
- *
- * @param {Amount<'nat'>} x - the amount of Brand X in pool, xPoolAllocation
- * @param {Amount<'nat'>} y - the amount of Brand Y in pool, yPoolAllocation
- * @param {Amount<'nat'>} deltaX - the amount of Brand X to be added
- * @param {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
- */
-export const checkKInvariantSellingX = (x, y, deltaX, deltaY) => {
-  const oldK = natSafeMath.multiply(x.value, y.value);
-  const newX = AmountMath.add(x, deltaX);
-  const newY = AmountMath.subtract(y, deltaY);
-  const newK = natSafeMath.multiply(newX.value, newY.value);
-  return oldK <= newK;
-};
-
-/**
- * xy <= (x + deltaX)(y - deltaY)
- *
- * @param {Amount<'nat'>} x - the amount of Brand X in pool, xPoolAllocation
- * @param {Amount<'nat'>} y - the amount of Brand Y in pool, yPoolAllocation
- * @param {Amount<'nat'>} deltaX - the amount of Brand X to be added
- * @param {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
- */
-export const assertKInvariantSellingX = (x, y, deltaX, deltaY) => {
-  checkKInvariantSellingX(x, y, deltaX, deltaY) ||
-    Fail`the constant product invariant was violated, with x=${x}, y=${y}, deltaX=${deltaX}, deltaY=${deltaY}, oldK=${natSafeMath.multiply(
-      x.value,
-      y.value,
-    )}, newK=${natSafeMath.multiply(
-      AmountMath.add(x, deltaX).value,
-      AmountMath.subtract(y, deltaY).value,
-    )}`;
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js
deleted file mode 100644
index 8d5a66d1995..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/swap.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-import { calculateFees, amountGT } from './calcFees.js';
-
-const { Fail } = assert;
-
-/**
- * The fee might not be in the same brand as the amount. If they are the same,
- * subtract the fee from the amount. Otherwise return the unadjusted amount.
- *
- * We return empty if the fee is larger because an empty amount indicates that
- * the trader didn't place a limit on the inputAmount.
- *
- * @param {Amount<'nat'>} amount
- * @param {Amount<'nat'>} fee
- * @returns {Amount<'nat'>}
- */
-const subtractRelevantFees = (amount, fee) => {
-  if (amount.brand === fee.brand) {
-    if (AmountMath.isGTE(fee, amount)) {
-      return AmountMath.makeEmptyFromAmount(amount);
-    }
-
-    return AmountMath.subtract(amount, fee);
-  }
-  return amount;
-};
-
-/**
- * PoolFee and ProtocolFee each identify their brand. If either (or both) match
- * the brand of the Amount, subtract it/them from the amount.
- *
- * @param {Amount<'nat'>} amount
- * @param {FeePair} fee
- * @returns {Amount<'nat'>}
- */
-const subtractFees = (amount, { poolFee, protocolFee }) => {
-  return subtractRelevantFees(
-    subtractRelevantFees(amount, protocolFee),
-    poolFee,
-  );
-};
-
-/**
- * The fee might not be in the same brand as the amount. If they are the same,
- * add the fee to the amount. Otherwise return the unadjusted amount.
- *
- * @param {Amount<'nat'>} amount
- * @param {Amount<'nat'>} fee
- * @returns {Amount<'nat'>}
- */
-const addRelevantFees = (amount, fee) => {
-  if (amount.brand === fee.brand) {
-    return AmountMath.add(amount, fee);
-  }
-  return amount;
-};
-
-/**
- * PoolFee and ProtocolFee each identify their brand. If either (or both) match
- * the brand of the Amount, add it/them to the amount.
- *
- * @param {Amount<'nat'>} amount
- * @param {FeePair} fee
- * @returns {Amount<'nat'>}
- */
-const addFees = (amount, { poolFee, protocolFee }) => {
-  return addRelevantFees(addRelevantFees(amount, protocolFee), poolFee);
-};
-
-/**
- * Increment or decrement a pool balance by an amount. The amount's brand might
- * match the Central or Secondary balance of the pool. Return the adjusted
- * balance. The caller knows which amount they provided, so they're expecting a
- * single Amount whose brand matches the amount parameter.
- *
- * The first parameter specifies whether we're incrementing or decrementing from the pool
- *
- * @param {(amountLeft: Amount<any>, amountRight: Amount<any>, brand?: Brand) => Amount<any>} addOrSub
- * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amount
- * @returns {Amount<'nat'>}
- */
-const addOrSubtractFromPool = (addOrSub, poolAllocation, amount) => {
-  if (poolAllocation.Central.brand === amount.brand) {
-    return addOrSub(poolAllocation.Central, amount);
-  } else {
-    return addOrSub(poolAllocation.Secondary, amount);
-  }
-};
-
-const isGreaterThanZero = amount => {
-  return amount && amountGT(amount, AmountMath.makeEmptyFromAmount(amount));
-};
-
-const assertGreaterThanZero = (amount, name) => {
-  (amount && isGreaterThanZero(amount)) ||
-    Fail`${name} must be greater than 0: ${amount}`;
-};
-
-const isWantedAvailable = (poolAllocation, amountWanted) => {
-  // The question is about a poolAllocation. If it has exactly amountWanted,
-  // that's not sufficient, since it would leave the pool empty.
-  return amountWanted.brand === poolAllocation.Central.brand
-    ? !AmountMath.isGTE(amountWanted, poolAllocation.Central)
-    : !AmountMath.isGTE(amountWanted, poolAllocation.Secondary);
-};
-
-/**
- * We've identified a violation of constraints that means we won't be able to
- * satisfy the user's request. (Not enough funds in the pool, too much was
- * requested, the proceeds would be empty, etc.) Return a result that says no
- * trade will take place and the pool balances won't change.
- *
- * @param {Amount<'nat'>} amountGiven
- * @param {Amount<'nat'>} amountWanted
- * @param {PoolAllocation} poolAllocation
- * @param {Ratio} poolFee
- */
-const makeNoTransaction = (
-  amountGiven,
-  amountWanted,
-  poolAllocation,
-  poolFee,
-) => {
-  const emptyGive = AmountMath.makeEmptyFromAmount(amountGiven);
-  const emptyWant = AmountMath.makeEmptyFromAmount(amountWanted);
-
-  let newX;
-  let newY;
-  if (poolAllocation.Central.brand === amountGiven.brand) {
-    newX = poolAllocation.Central;
-    newY = poolAllocation.Secondary;
-  } else {
-    newX = poolAllocation.Secondary;
-    newY = poolAllocation.Central;
-  }
-
-  const result = harden({
-    protocolFee: AmountMath.makeEmpty(poolAllocation.Central.brand),
-    poolFee: AmountMath.makeEmpty(poolFee.numerator.brand),
-    swapperGives: emptyGive,
-    swapperGets: emptyWant,
-    xIncrement: emptyGive,
-    yDecrement: emptyWant,
-    newX,
-    newY,
-  });
-  return result;
-};
-
-/**
- * This is the heart of the calculation. See README.md for the long explanation.
- * calculate how much should be added to and removed from the pool, the fees,
- * and what the user will pay and receive.
- *
- * As soon as we detect that we won't be able to satisfy the request, we return
- * noTransaction, indicating that no trade should take place. This can be due to
- * a request for more assets than the pool holds, a specified price the current
- * assets won't support, or the trade would require more than the trader allowed,
- * or provide less, or fees would eat up all the trader's proceeds.
- *
- * We start by calculating the amounts that would be traded if no fees were
- * charged. The actual fees are based on these amounts. Once we know the actual
- * fees, we calculate the deltaX and deltaY that will best maintain the
- * constant product invariant.
- *
- * The amounts by which the pool will be adjusted, that the trader will pay and
- * receive, and the fees are then computed based on deltaX and deltaY.
- *
- * @type {InternalSwap}
- */
-export const swap = (
-  amountGiven,
-  poolAllocation,
-  amountWanted,
-  protocolFeeRatio,
-  poolFeeRatio,
-  swapFn,
-) => {
-  const noTransaction = makeNoTransaction(
-    amountGiven,
-    amountWanted,
-    poolAllocation,
-    poolFeeRatio,
-  );
-  assertGreaterThanZero(poolAllocation.Central, 'poolAllocation.Central');
-  assertGreaterThanZero(poolAllocation.Secondary, 'poolAllocation.Secondary');
-
-  if (!isGreaterThanZero(amountGiven) && !isGreaterThanZero(amountWanted)) {
-    return noTransaction;
-  }
-
-  if (!isWantedAvailable(poolAllocation, amountWanted)) {
-    return noTransaction;
-  }
-
-  // The protocol fee must always be collected in `Fee`, but the pool
-  // fee is collected in the amount opposite of what is specified.
-  // This call gives us improved amountIn or amountOut
-  const fees = calculateFees(
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-    swapFn,
-  );
-
-  if (!isWantedAvailable(poolAllocation, addFees(amountWanted, fees))) {
-    return noTransaction;
-  }
-
-  // Calculate no-fee amounts. swapFn will only pay attention to the `specified`
-  // value. The pool fee is always charged on the unspecified side, so it is an
-  // output of the calculation. When the specified value is in `Fee`, the protocol fee will
-  // be deducted from amountGiven before adding to the pool or added to
-  // amountWanted to calculate amountOut. Otherwise we add the protocol fee
-  // to amountWanted.
-  const { amountIn, amountOut } = swapFn({
-    amountGiven: subtractFees(amountGiven, fees),
-    poolAllocation,
-    amountWanted: addFees(amountWanted, fees),
-  });
-
-  if (AmountMath.isEmpty(amountOut)) {
-    return noTransaction;
-  }
-
-  // The swapper pays extra or receives less to cover the fees.
-  const swapperGives = addFees(amountIn, fees);
-  const swapperGets = subtractFees(amountOut, fees);
-
-  // return noTransaction if fees would eat up all the trader's proceeds,
-  // the trader specified an amountGiven, and the trade would require more, or
-  // the trade would require them to give more than they specified.
-  if (
-    AmountMath.isEmpty(swapperGets) ||
-    (!AmountMath.isEmpty(amountGiven) && amountGT(swapperGives, amountGiven)) ||
-    amountGT(amountWanted, swapperGets)
-  ) {
-    return noTransaction;
-  }
-
-  const xIncrement = addRelevantFees(amountIn, fees.poolFee);
-  const yDecrement = subtractRelevantFees(amountOut, fees.poolFee);
-
-  // poolFee is the amount the pool will grow over the no-fee calculation.
-  // protocolFee is to be separated and sent to an external purse.
-  // The swapper amounts are what will be paid and received.
-  // xIncrement and yDecrement are what will be added and removed from the pools.
-  //   Either xIncrement will be increased by the pool fee or yDecrement will be
-  //   reduced by it in order to compensate the pool.
-  // newX and newY are the new pool balances, for comparison with start values.
-  const result = harden({
-    protocolFee: fees.protocolFee,
-    poolFee: fees.poolFee,
-    swapperGives,
-    swapperGets,
-    xIncrement,
-    yDecrement,
-    newX: addOrSubtractFromPool(AmountMath.add, poolAllocation, xIncrement),
-    newY: addOrSubtractFromPool(
-      AmountMath.subtract,
-      poolAllocation,
-      yDecrement,
-    ),
-  });
-
-  return result;
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js b/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js
deleted file mode 100644
index 7fe34c37867..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/constantProduct/types.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @callback Maximum
- * @param {Amount} left
- * @param {Amount} right
- * @returns {Amount}
- */
-
-/**
- * A bigint representing a number that will be divided by 10,0000. Financial
- * ratios are often represented in basis points.
- *
- * @typedef {bigint} BASIS_POINTS
- */
-
-/**
- * Make a Ratio representing a fee expressed in Basis Points.  (hundredths of a
- *    percent)
- *
- * @callback MakeFeeRatio
- * @param {BASIS_POINTS} feeBP
- * @param {Brand} brandOfFee
- * @returns {Ratio}
- */
-
-/**
- * @callback AmountGT
- * @param {Amount} left
- * @param {Amount} right
- * @returns {boolean}
- */
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js b/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js
deleted file mode 100644
index 07333bcaba6..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/doublePool.js
+++ /dev/null
@@ -1,200 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-import {
-  atomicRearrange,
-  fromOnly,
-  toOnly,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import { Far } from '@endo/marshal';
-import { makeFeeRatio } from './constantProduct/calcFees.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from './constantProduct/calcSwapPrices.js';
-
-const { Fail } = assert;
-
-// Price calculations and swap using a pair of pools. Both pools map between RUN
-// and some collateral. We arrange the trades so collateralInPool will have
-// collateral added and collateralOutPool subtracted. When traders specify an
-// input price, that brand will be the inPool; when they specify the output
-// price that brand is the outPool.
-
-/**
- * doublePool is the virtualPool implementation for calculating prices when
- * transiting through two pools. virtual pools wrap something that can do a swap
- * and calculate prices. Current wrapped pools are single pools and pairs of
- * pools, but we've also contemplated using a similar virtual wrapper for other
- * curves.
- *
- * @param {ZCF} zcf
- * @param {XYKPool} collateralInPool
- * @param {XYKPool} collateralOutPool
- * @param {() => bigint} getProtocolFeeBP - retrieve governed protocol fee value
- * @param {() => bigint} getPoolFeeBP - retrieve governed pool fee value
- * @param {ZCFSeat} feeSeat
- * @returns {VirtualPool<'double'>}
- */
-export const makeDoublePool = (
-  zcf,
-  collateralInPool,
-  collateralOutPool,
-  getProtocolFeeBP,
-  getPoolFeeBP,
-  feeSeat,
-) => {
-  const inCentral = collateralInPool.getCentralAmount();
-  const inSecondary = collateralInPool.getSecondaryAmount();
-
-  const outCentral = collateralOutPool.getCentralAmount();
-  const outSecondary = collateralOutPool.getSecondaryAmount();
-
-  const inAllocation = { Central: inCentral, Secondary: inSecondary };
-  const outAllocation = { Central: outCentral, Secondary: outSecondary };
-
-  const centralBrand = inCentral.brand;
-  const emptyCentralAmount = AmountMath.makeEmpty(centralBrand);
-  centralBrand === outCentral.brand ||
-    Fail`The central brands on the two pools must match: ${centralBrand}, ${outCentral.brand}`;
-
-  const allocateGainsAndLosses = (seat, prices) => {
-    const inPoolSeat = collateralInPool.getPoolSeat();
-    const outPoolSeat = collateralOutPool.getPoolSeat();
-
-    atomicRearrange(
-      zcf,
-      harden([
-        fromOnly(seat, { In: prices.swapperGives }),
-        fromOnly(inPoolSeat, { Central: prices.inPoolDecrement }),
-        fromOnly(outPoolSeat, { Secondary: prices.outPoolDecrement }),
-
-        toOnly(seat, { Out: prices.swapperGets }),
-        toOnly(inPoolSeat, { Secondary: prices.inPoolIncrement }),
-        toOnly(outPoolSeat, { Central: prices.outPoolIncrement }),
-        toOnly(feeSeat, { Fee: prices.protocolFee }),
-      ]),
-    );
-
-    seat.exit();
-    collateralInPool.updateState();
-    collateralOutPool.updateState();
-    return `Swap successfully completed.`;
-  };
-
-  const getPriceForInput = (amountIn, amountOut) => {
-    const protocolFeeRatio = makeFeeRatio(getProtocolFeeBP(), centralBrand);
-    const poolFeeRatioCentral = makeFeeRatio(getPoolFeeBP(), centralBrand);
-    const poolFeeRatioAmountOut = makeFeeRatio(getPoolFeeBP(), amountOut.brand);
-
-    // We must do two consecutive swapInPrice() calls,
-    // followed by a call to swapOutPrice().
-    // 1) from amountIn to the central token, which tells us how much central
-    //  would be provided for amountIn,
-    // 2) from that amount of central to brandOut, which tells us how much of
-    //  brandOut will be provided as well as the minimum price in central
-    //  tokens, then finally
-    // 3) call swapOutPrice() to see if the same proceeds can be purchased for
-    //  less.
-    // Notice that in the second call, the original amountOut is used, and in
-    // the third call, the original amountIn is used.
-    const interimInpoolPrices = pricesForStatedInput(
-      amountIn,
-      inAllocation,
-      emptyCentralAmount,
-      protocolFeeRatio,
-      poolFeeRatioCentral,
-    );
-    const outPoolPrices = pricesForStatedInput(
-      interimInpoolPrices.swapperGets,
-      outAllocation,
-      amountOut,
-      protocolFeeRatio,
-      poolFeeRatioAmountOut,
-    );
-    const finalInPoolPrices = pricesForStatedOutput(
-      amountIn,
-      inAllocation,
-      outPoolPrices.swapperGives,
-      protocolFeeRatio,
-      poolFeeRatioCentral,
-    );
-
-    // When finalInPoolPrices has a price improvement that makes the difference
-    // between finalInPoolPrices.yDecrement and outPoolPrices.xIncrement more
-    // than the calculated protocol fees add the excess to the protocol fee.
-    const protocolFee = AmountMath.max(
-      AmountMath.add(finalInPoolPrices.protocolFee, outPoolPrices.protocolFee),
-      AmountMath.subtract(
-        finalInPoolPrices.yDecrement,
-        outPoolPrices.xIncrement,
-      ),
-    );
-
-    return harden({
-      swapperGives: finalInPoolPrices.swapperGives,
-      swapperGets: outPoolPrices.swapperGets,
-      inPoolIncrement: finalInPoolPrices.xIncrement,
-      inPoolDecrement: finalInPoolPrices.yDecrement,
-      outPoolIncrement: outPoolPrices.xIncrement,
-      outPoolDecrement: outPoolPrices.yDecrement,
-      protocolFee,
-    });
-  };
-
-  const getPriceForOutput = (amountIn, amountOut) => {
-    const protocolFeeRatio = makeFeeRatio(getProtocolFeeBP(), centralBrand);
-    const poolFeeRatioCentral = makeFeeRatio(getPoolFeeBP(), centralBrand);
-    const poolFeeRatioAmountIn = makeFeeRatio(getPoolFeeBP(), amountIn.brand);
-
-    // We must do two consecutive swapOutPrice() calls, followed by a call to
-    // swapInPrice().
-    // 1) from amountOut to the central token, which tells us how much central
-    //  is required to obtain amountOut,
-    // 2) from that amount of central to brandIn, which tells us how much of
-    //  brandIn is required as well as the max proceeds in central tokens, then
-    //  finally
-    // 3) call swapInPrice() to see if those central proceeds could purchase
-    //  larger amount
-    // Notice that the amountIn parameter to the first call to swapOutPrice
-    // specifies an empty amount. This is interpreted as "no limit", which is
-    // necessary since we can't guess a reasonable maximum of the central token.
-    const interimOutpoolPrices = pricesForStatedOutput(
-      emptyCentralAmount,
-      outAllocation,
-      amountOut,
-      protocolFeeRatio,
-      poolFeeRatioCentral,
-    );
-    const inpoolPrices = pricesForStatedOutput(
-      amountIn,
-      inAllocation,
-      interimOutpoolPrices.swapperGives,
-      protocolFeeRatio,
-      poolFeeRatioAmountIn,
-    );
-    const finalOutpoolPrices = pricesForStatedInput(
-      inpoolPrices.swapperGets,
-      outAllocation,
-      amountOut,
-      protocolFeeRatio,
-      poolFeeRatioCentral,
-    );
-    return harden({
-      swapperGives: inpoolPrices.swapperGives,
-      swapperGets: finalOutpoolPrices.swapperGets,
-      inPoolIncrement: inpoolPrices.xIncrement,
-      inPoolDecrement: inpoolPrices.yDecrement,
-      outPoolIncrement: finalOutpoolPrices.xIncrement,
-      outPoolDecrement: finalOutpoolPrices.yDecrement,
-      protocolFee: AmountMath.add(
-        finalOutpoolPrices.protocolFee,
-        inpoolPrices.protocolFee,
-      ),
-    });
-  };
-
-  return Far('double pool', {
-    getPriceForInput,
-    getPriceForOutput,
-    allocateGainsAndLosses,
-  });
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/estimate.js b/packages/inter-protocol/src/vpool-xyk-amm/estimate.js
deleted file mode 100644
index 3db072503c4..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/estimate.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
-import { AmountMath } from '@agoric/ertp';
-import { BASIS_POINTS } from './constantProduct/defaults.js';
-
-/**
- * @file support the UI in calculating how much to offer, taking slippage
- * into account, and not requiring a round trip to the chain.
- */
-
-/** @typedef {{ centralAmount: Amount<'nat'>, secondaryAmount: Amount<'nat'> }} Pool */
-
-const { ceilDivide, floorDivide } = natSafeMath;
-
-/**
- * @param {bigint} chargeBP
- * @param {Amount<'nat'>} amount
- */
-export const charge = (chargeBP, amount) => {
-  return AmountMath.make(
-    amount.brand,
-    ceilDivide(amount.value * chargeBP, BASIS_POINTS),
-  );
-};
-
-/**
- * @param {bigint} chargeBP
- * @param {Amount<'nat'>} amount
- */
-export const chargeFloor = (chargeBP, amount) => {
-  return AmountMath.make(
-    amount.brand,
-    floorDivide(amount.value * chargeBP, BASIS_POINTS),
-  );
-};
-
-const makeEstimator = (centralBrand, rates) => {
-  const { poolFeeBP, protocolFeeBP, slippageBP } = rates;
-
-  /**
-   * Proceeds less slippage when specifying the amount to add to a single pool
-   *
-   * @param {Amount<'nat'>} amountIn
-   * @param {Brand<'nat'>} brandOut
-   * @param {MapStore<Brand, Pool>} pools
-   */
-  function estimateSinglePoolProceeds(amountIn, brandOut, pools) {
-    const isCentralIn = amountIn.brand === centralBrand;
-    const pool = isCentralIn ? pools.get(brandOut) : pools.get(amountIn.brand);
-    const kPre = pool.secondaryAmount.value * pool.centralAmount.value;
-
-    function calcYFromX(X) {
-      const denom = isCentralIn
-        ? AmountMath.add(pool.centralAmount, X)
-        : AmountMath.add(pool.secondaryAmount, X);
-      const finalOutBalance = AmountMath.make(
-        brandOut,
-        ceilDivide(kPre, denom.value),
-      );
-
-      return isCentralIn
-        ? AmountMath.subtract(pool.secondaryAmount, finalOutBalance)
-        : AmountMath.subtract(pool.centralAmount, finalOutBalance);
-    }
-
-    const amountAdded = isCentralIn
-      ? AmountMath.subtract(amountIn, charge(protocolFeeBP, amountIn))
-      : amountIn;
-    const amountOutForFees = calcYFromX(amountIn);
-    const amountOut = calcYFromX(amountAdded);
-    const amountRemoved = AmountMath.subtract(
-      amountOut,
-      charge(poolFeeBP, amountOutForFees),
-    );
-    const amountReturned = isCentralIn
-      ? amountRemoved
-      : AmountMath.subtract(
-          amountRemoved,
-          charge(protocolFeeBP, amountOutForFees),
-        );
-
-    return amountReturned;
-  }
-
-  /**
-   * Payment w/slippage when specifying the amount to receive from a single pool
-   *
-   * @param {Brand<'nat'>} brandIn
-   * @param {Amount<'nat'>} amountOut
-   * @param {MapStore<Brand, Pool>} pools
-   */
-  function estimateSinglePoolRequired(brandIn, amountOut, pools) {
-    const isCentralIn = brandIn === centralBrand;
-    const pool = isCentralIn ? pools.get(amountOut.brand) : pools.get(brandIn);
-    const kPre = pool.secondaryAmount.value * pool.centralAmount.value;
-    const amountWithdrawn = isCentralIn
-      ? AmountMath.add(amountOut, charge(protocolFeeBP, amountOut))
-      : amountOut;
-
-    const calcXFromY = y => {
-      const denom = isCentralIn
-        ? AmountMath.subtract(pool.secondaryAmount, y)
-        : AmountMath.subtract(pool.centralAmount, y);
-      const finalInBalance = AmountMath.make(
-        brandIn,
-        ceilDivide(kPre, denom.value),
-      );
-      return isCentralIn
-        ? AmountMath.subtract(finalInBalance, pool.centralAmount)
-        : AmountMath.subtract(finalInBalance, pool.secondaryAmount);
-    };
-
-    const amountInForFees = calcXFromY(amountOut);
-    const amountIn = calcXFromY(amountWithdrawn);
-    const amountAddToPool = AmountMath.add(
-      amountIn,
-      charge(poolFeeBP, amountInForFees),
-    );
-    const amountToBePaid = isCentralIn
-      ? amountAddToPool
-      : AmountMath.add(
-          amountAddToPool,
-          chargeFloor(protocolFeeBP, amountInForFees),
-        );
-
-    return amountToBePaid;
-  }
-
-  // ignores price improvement
-  function estimateDoublePoolProceeds(amountIn, brandOut, pools) {
-    const inProceeds = estimateSinglePoolProceeds(
-      amountIn,
-      centralBrand,
-      pools,
-    );
-    const outProceeds = estimateSinglePoolProceeds(inProceeds, brandOut, pools);
-    return outProceeds;
-  }
-
-  // ignores price improvement
-  function estimateDoublePoolRequired(brandIn, amountOut, pools) {
-    const outRequired = estimateSinglePoolRequired(
-      centralBrand,
-      amountOut,
-      pools,
-    );
-    const inRequired = estimateSinglePoolRequired(brandIn, outRequired, pools);
-    return inRequired;
-  }
-
-  const estimateProceeds = (amountIn, brandOut, pools) => {
-    let proceeds;
-    if (amountIn.brand === centralBrand || brandOut === centralBrand) {
-      proceeds = estimateSinglePoolProceeds(amountIn, brandOut, pools);
-    } else {
-      proceeds = estimateDoublePoolProceeds(amountIn, brandOut, pools);
-    }
-    return AmountMath.subtract(proceeds, charge(slippageBP, proceeds));
-  };
-
-  const estimateRequired = (brandIn, amountOut, pools) => {
-    let required;
-    if (brandIn === centralBrand || amountOut.brand === centralBrand) {
-      required = estimateSinglePoolRequired(brandIn, amountOut, pools);
-    } else {
-      required = estimateDoublePoolRequired(brandIn, amountOut, pools);
-    }
-
-    return AmountMath.add(required, charge(slippageBP, required));
-  };
-
-  return { estimateProceeds, estimateRequired };
-};
-harden(makeEstimator);
-
-export { makeEstimator };
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js b/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js
deleted file mode 100644
index 53084b20cf0..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/multipoolMarketMaker.js
+++ /dev/null
@@ -1,530 +0,0 @@
-import '@agoric/zoe/exported.js';
-
-import { AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { handleParamGovernance, ParamTypes } from '@agoric/governance';
-import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
-import {
-  assertIssuerKeywords,
-  offerTo,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
-import { initEmpty } from '@agoric/store';
-import {
-  provideDurableMapStore,
-  provideDurableWeakMapStore,
-  provide,
-  prepareKindMulti,
-} from '@agoric/vat-data';
-import { makeTracer } from '@agoric/internal';
-import { makeMakeCollectFeesInvitation } from '../collectFees.js';
-import { makeMetricsPublisherKit } from '../contractSupport.js';
-import {
-  makeMakeAddLiquidityAtRateInvitation,
-  makeMakeAddLiquidityInvitation,
-} from './addLiquidity.js';
-import { makeAddIssuer, makeAddPoolInvitation } from './addPool.js';
-import { makeDoublePool } from './doublePool.js';
-import {
-  MIN_INITIAL_POOL_LIQUIDITY_KEY,
-  POOL_FEE_KEY,
-  PROTOCOL_FEE_KEY,
-} from './params.js';
-import { publicPrices } from './pool.js';
-import { makeMakeRemoveLiquidityInvitation } from './removeLiquidity.js';
-import { makeMakeSwapInvitation } from './swap.js';
-
-import '@agoric/governance/exported.js';
-
-const { quote: q, details: X } = assert;
-
-const trace = makeTracer('XykAmm', false);
-
-/**
- * @typedef {object} MetricsNotification
- * @property {Brand[]} XYK brands of pools that use an X*Y=K pricing policy
- */
-
-/** @typedef {GovernanceTerms< {MinInitialPoolLiquidity: 'amount'} & {ProtocolFee: 'amount'} & {PoolFee: 'amount'}>} AmmGovernanceParams */
-
-/** @typedef {{brands:BrandKeywordRecord,timer:import('@agoric/time/src/types').TimerService}} AmmTerms */
-
-/**
- * @typedef {Readonly<{
- * zcf: ZCF<AmmTerms>,
- * secondaryBrandToPool: WeakMapStore<Brand,PoolFacets>,
- * secondaryBrandToLiquidityMint: WeakMapStore<Brand,ZCFMint<'nat'>>,
- * centralBrand: Brand<'nat'>,
- * timer: import('@agoric/time/src/types').TimerService,
- * quoteIssuerKit: IssuerKit<'set'>,
- * params: import('@agoric/governance/src/contractGovernance/typedParamManager').Getters<import('./params.js').AmmParams>,
- * protocolSeat: ZCFSeat,
- * }>} AmmPowers
- */
-
-//  All the state at the AMM level is shared lexically. Some functions here have
-//  to ignore their first parameter since they have other parameters and are
-//  included in virtual/durable facets.
-/** @typedef {{}} MethodContext */
-
-/** @typedef {import('@agoric/vat-data').Baggage} Baggage */
-
-/**
- * Multipool AMM is a rewrite of Uniswap that supports multiple liquidity pools,
- * and direct exchanges across pools. Please see the documentation for more:
- * https://agoric.com/documentation/zoe/guide/contracts/multipoolAMM.html It
- * also uses a unique approach to charging fees. Each pool grows on every trade,
- * and a protocolFee is extracted.
- *
- * We expect that this contract will have tens to hundreds of issuers.  Each
- * liquidity pool is between the central token and a secondary token. Secondary
- * tokens can be exchanged with each other, but only through the central
- * token. For example, if X and Y are two token types and C is the central
- * token, a swap giving X and wanting Y would first use the pool (X, C) then the
- * pool (Y, C). There are no liquidity pools directly between two secondary
- * tokens.
- *
- * There should only need to be one instance of this contract, so liquidity can
- * be shared as much as possible.
- *
- * When the contract is instantiated, the central token is specified in the
- * terms. Separate invitations are available by calling methods on the
- * publicFacet for adding and removing liquidity and for making trades. Other
- * publicFacet operations support querying prices and the sizes of pools. New
- * Pools can be created by first calling addIssuer() and then exercising an
- * invitation from addPoolInvitation().
- *
- * When making trades or requesting prices, the caller must specify either a
- * maximum input amount (swapIn, getInputPrice) or a minimum output amount
- * (swapOut, getOutPutPrice) or both. For swaps, the required keywords are `In`
- * for the trader's `give` amount, and `Out` for the trader's `want` amount.
- * getInputPrice and getOutputPrice each take two Amounts. The price functions
- * return both amountIn (which may be lower than the original amount) and
- * amountOut (which may be higher). When both prices are specified, no swap will
- * be made (and no price provided) if both restrictions can't be honored.
- *
- * When adding and removing liquidity, the keywords are Central, Secondary, and
- * Liquidity. adding liquidity has Central and Secondary in the `give` section,
- * while removing liquidity has `want` and `give` swapped.
- *
- * Transactions that don't require an invitation include addPool and the
- * queries: getInputPrice, getOutputPrice, getPoolAllocation,
- * getLiquidityIssuer, and getLiquiditySupply.
- *
- * This contract has two parameters (poolFee and protocolFee) that are
- * managed by governance. The contract calls `handleParamGovernance()` at
- * startup, which allows a contractManager to call for votes that would change
- * the parameter values in a transparent way. When correctly set up, customers
- * with access to this contract's publicFacet can verify the connectivity, and
- * see which Electorate has the ability to vote on changes, and which votes are
- * ongoing or have taken place. If not correctly set up, the validation checks
- * will fail visibly.
- *
- * The initial values of the parameters are provided as poolFeeBP and
- * protocolFeeBP in terms. The poolFee is charged in {Central} and each collateral, so
- * it is provided as a bigint. The protocolFee is always charged in {Fee}, but the
- * initial value is specified as a bigint for consistency.
- *
- * The contract gets the initial values for those parameters from its terms, and
- * thereafter can be seen to only use the values provided by the
- * getter method returned by the paramManager.
- *
- * `handleParamGovernance()` adds several methods to the publicFacet of the
- * contract, and bundles the privateFacet to ensure that governance
- * functionality is only accessible to the contractGovernor.
- *
- * The creatorFacet has one method (makeCollectFeesInvitation, which returns
- * collected fees to the creator). `handleParamGovernance()` adds internal
- * methods used by the contractGovernor. The contractGovernor then has access to
- * those internal methods, and reveals the original AMM creatorFacet to its own
- * creator.
- *
- * @param {ZCF<AMMTerms>} zcf
- * @param {{
- *   initialPoserInvitation: Invitation,
- *   storageNode: ERef<StorageNode>,
- *   marshaller: ERef<Marshaller>,
- * }} privateArgs
- * @param {Baggage} baggage
- */
-const start = async (zcf, privateArgs, baggage) => {
-  /**
-   * This contract must have a "Central" keyword and issuer in the
-   * IssuerKeywordRecord.
-   */
-  const { brands, timer } = zcf.getTerms();
-  assertIssuerKeywords(zcf, ['Central']);
-  const centralBrand = /** @type {Brand<'nat'>} */ (brands.Central);
-  assert(centralBrand !== undefined, 'centralBrand must be present');
-
-  const [
-    { augmentVirtualPublicFacet, makeVirtualGovernorFacet, params },
-    centralDisplayInfo,
-  ] = await Promise.all([
-    handleParamGovernance(
-      zcf,
-      privateArgs.initialPoserInvitation,
-      {
-        [POOL_FEE_KEY]: ParamTypes.NAT,
-        [PROTOCOL_FEE_KEY]: ParamTypes.NAT,
-        [MIN_INITIAL_POOL_LIQUIDITY_KEY]: ParamTypes.AMOUNT,
-      },
-      privateArgs.storageNode,
-      privateArgs.marshaller,
-    ),
-    E(centralBrand).getDisplayInfo(),
-    privateArgs.storageNode,
-    privateArgs.marshaller,
-  ]);
-
-  assert.equal(
-    centralDisplayInfo.assetKind,
-    AssetKind.NAT,
-    X`Central must be of kind ${q(AssetKind.NAT)}, not ${q(
-      centralDisplayInfo.assetKind,
-    )}`,
-  );
-
-  /** @type {MapStore<Brand,PoolFacets>} */
-  const secondaryBrandToPool = provideDurableMapStore(
-    baggage,
-    'secondaryBrandToPool',
-  );
-  const getPool = brand => {
-    // TODO: https://github.com/Agoric/agoric-sdk/issues/5776
-    assert(
-      secondaryBrandToPool.has(brand),
-      `"secondaryBrandToPool" not found: ${q(brand)}`,
-    );
-    return secondaryBrandToPool.get(brand).pool;
-  };
-  const getPoolHelper = brand => secondaryBrandToPool.get(brand).helper;
-  // XXX a brand can be in secondaryBrandToLiquidityMint and return false for this check
-  // if it's called between addIssuer and addPool
-  const isSecondary = secondaryBrandToPool.has;
-
-  // The liquidityBrand has to exist to allow the addPool Offer to specify want
-  /** @type {WeakMapStore<Brand<'nat'>, ZCFMint<'nat'>>} */
-  const secondaryBrandToLiquidityMint = provideDurableWeakMapStore(
-    baggage,
-    'secondaryBrandToLiquidityMint',
-  );
-  const secondaryBrandToLiquidityMintProvider = makeAtomicProvider(
-    secondaryBrandToLiquidityMint,
-  );
-
-  const quoteIssuerKit = provide(baggage, 'quoteIssuerKit', () =>
-    makeIssuerKit('Quote', AssetKind.SET),
-  );
-
-  const { metricsPublication, metricsSubscription } = makeMetricsPublisherKit(
-    privateArgs.storageNode,
-    privateArgs.marshaller,
-  );
-  const updateMetrics = () => {
-    metricsPublication.updateState(
-      harden({ XYK: Array.from(secondaryBrandToPool.keys()) }),
-    );
-  };
-  updateMetrics();
-
-  // For now, this seat collects protocol fees. It needs to be connected to
-  // something that will extract the fees.
-  const protocolSeat = provide(
-    baggage,
-    'protocolSeat',
-    () => zcf.makeEmptySeatKit().zcfSeat,
-  );
-
-  /** @type {AssetReservePublicFacet | undefined} */
-  let reserveFacet = baggage.has('reserveFacet')
-    ? baggage.get('reserveFacet')
-    : undefined;
-
-  /**
-   * @param {Brand<'nat'>} secondaryBrand
-   * @param {ZCFSeat} reserveLiquidityTokenSeat
-   * @param {Keyword} liquidityKeyword
-   * @returns {Promise<void>} up to caller whether to await or handle rejections
-   */
-  const handlePoolAdded = async (
-    secondaryBrand,
-    reserveLiquidityTokenSeat,
-    liquidityKeyword,
-  ) => {
-    trace('handlePoolAdded', { secondaryBrand, liquidityKeyword });
-    updateMetrics();
-
-    assert(reserveFacet, 'Missing reserveFacet');
-    assert(reserveLiquidityTokenSeat, 'Missing reserveLiquidityTokenSeat');
-
-    const secondaryIssuer = await zcf.getIssuerForBrand(secondaryBrand);
-    trace('ensuring reserve has the liquidity issuer', {
-      secondaryBrand,
-      secondaryIssuer,
-    });
-    await E(reserveFacet).addLiquidityIssuer(secondaryIssuer);
-
-    trace(
-      `move ${liquidityKeyword} to the reserve`,
-      reserveLiquidityTokenSeat.getCurrentAllocation(),
-    );
-    const addCollateral = await E(reserveFacet).makeAddCollateralInvitation();
-    const proposal = harden({
-      give: {
-        Collateral:
-          reserveLiquidityTokenSeat.getCurrentAllocation()[liquidityKeyword],
-      },
-    });
-    const { deposited, userSeatPromise } = await offerTo(
-      zcf,
-      addCollateral,
-      harden({ [liquidityKeyword]: 'Collateral' }),
-      proposal,
-      reserveLiquidityTokenSeat,
-    );
-    const deposits = await deposited;
-    trace('handlePoolAdded deposited', deposits);
-    await E(userSeatPromise).getOfferResult();
-    reserveLiquidityTokenSeat.exit();
-    trace('handlePoolAdded done');
-  };
-
-  /**
-   * @param {MethodContext} _context
-   * @param {Brand<'nat'>} brand
-   */
-  const getLiquidityIssuer = (_context, brand) =>
-    secondaryBrandToLiquidityMint.get(brand).getIssuerRecord().issuer;
-  /**
-   * @param {MethodContext} _context
-   * @param {Brand} brand
-   */
-  const getLiquiditySupply = (_context, brand) =>
-    getPool(brand).getLiquiditySupply();
-
-  /**
-   * @param {MethodContext} _context
-   * @param {Brand<'nat'>} brand
-   */
-  const getSecondaryIssuer = (_context, brand) => {
-    assert(
-      secondaryBrandToLiquidityMint.has(brand),
-      'Brand not a secondary of the AMM',
-    );
-    return zcf.getIssuerForBrand(brand);
-  };
-  const poolStorageNode = await (privateArgs.storageNode &&
-    E(privateArgs.storageNode).makeChildNode(
-      // NB: the set of pools grows monotonically
-      `pool${secondaryBrandToPool.getSize()}`,
-    ));
-
-  // shared AMM state that will be lexically accessible to all pools
-  /** @type {AmmPowers} */
-  const ammPowers = harden({
-    zcf,
-    secondaryBrandToPool,
-    secondaryBrandToLiquidityMint,
-    centralBrand,
-    timer,
-    quoteIssuerKit,
-    params,
-    protocolSeat,
-  });
-  const addPoolInvitation = makeAddPoolInvitation(
-    baggage,
-    ammPowers,
-    handlePoolAdded,
-    poolStorageNode,
-    privateArgs.marshaller,
-  );
-  const addIssuer = makeAddIssuer(
-    zcf,
-    isSecondary,
-    secondaryBrandToLiquidityMintProvider,
-    () => {
-      assert(reserveFacet, 'Must first resolveReserveFacet');
-      return secondaryBrand =>
-        E(
-          /** @type {AssetReservePublicFacet} */ (reserveFacet),
-        ).addIssuerFromAmm(secondaryBrand);
-    },
-  );
-
-  /**
-   * @param {unknown} _context
-   * @param {Brand} brand
-   */
-  const getPoolAllocation = (_context, brand) =>
-    getPool(brand).getPoolSeat().getCurrentAllocation();
-
-  /**
-   * @param {*} _context xxx
-   * @param {Brand} brand
-   */
-  const getPriceAuthorities = (_context, brand) => {
-    const pool = getPool(brand);
-    return {
-      toCentral: pool.getToCentralPriceAuthority(),
-      fromCentral: pool.getFromCentralPriceAuthority(),
-    };
-  };
-
-  /**
-   * @param {MethodContext} _context
-   * @param {Brand} brand
-   */
-  const getPoolMetrics = (_context, brand) => getPool(brand).getMetrics();
-
-  /**
-   * @param {Brand} brandIn
-   * @param {Brand} [brandOut]
-   * @returns {VirtualPool}
-   */
-  const provideVPool = (brandIn, brandOut) => {
-    if (!brandOut) {
-      return getPool(brandIn).getVPool();
-    }
-
-    if (isSecondary(brandIn) && isSecondary(brandOut)) {
-      return makeDoublePool(
-        zcf,
-        getPool(brandIn),
-        getPool(brandOut),
-        params.getProtocolFee,
-        params.getPoolFee,
-        protocolSeat,
-      );
-    }
-
-    const pool = isSecondary(brandOut) ? getPool(brandOut) : getPool(brandIn);
-    return pool.getVPool();
-  };
-
-  /**
-   * @param {*} _context xxx
-   * @param {Amount<'nat'>} amountIn
-   * @param {Amount<'nat'>} amountOut
-   */
-  const getInputPrice = (_context, amountIn, amountOut) => {
-    const pool = provideVPool(amountIn.brand, amountOut.brand);
-    return publicPrices(pool.getPriceForInput(amountIn, amountOut));
-  };
-
-  /**
-   * @param {*} _context xxx
-   * @param {Amount<'nat'>} amountIn
-   * @param {Amount<'nat'>} amountOut
-   */
-  const getOutputPrice = (_context, amountIn, amountOut) => {
-    const pool = provideVPool(amountIn.brand, amountOut.brand);
-    return publicPrices(pool.getPriceForOutput(amountIn, amountOut));
-  };
-
-  const { makeSwapInInvitation, makeSwapOutInvitation } =
-    makeMakeSwapInvitation(zcf, provideVPool);
-  const makeAddLiquidityInvitation = makeMakeAddLiquidityInvitation(
-    zcf,
-    getPool,
-  );
-  const makeAddLiquidityAtRateInvitation = makeMakeAddLiquidityAtRateInvitation(
-    zcf,
-    getPool,
-    provideVPool,
-    protocolSeat,
-    getPoolHelper,
-  );
-
-  const makeRemoveLiquidityInvitation = makeMakeRemoveLiquidityInvitation(
-    zcf,
-    getPool,
-  );
-
-  const { makeCollectFeesInvitation } = makeMakeCollectFeesInvitation(
-    zcf,
-    protocolSeat,
-    centralBrand,
-    'Fee',
-  );
-
-  const publicFacet = augmentVirtualPublicFacet(
-    Far('AMM public facet', {
-      addPoolInvitation,
-      addIssuer,
-      getPoolAllocation,
-      getLiquidityIssuer,
-      getLiquiditySupply,
-      getInputPrice,
-      getOutputPrice,
-      getSecondaryIssuer,
-      makeSwapInvitation: makeSwapInInvitation,
-      makeSwapInInvitation,
-      makeSwapOutInvitation,
-      makeAddLiquidityInvitation,
-      makeAddLiquidityAtRateInvitation,
-      makeRemoveLiquidityInvitation,
-      getQuoteIssuer: () => quoteIssuerKit.issuer,
-      getPriceAuthorities,
-      getAllPoolBrands: () =>
-        Object.values(zcf.getTerms().brands).filter(isSecondary),
-      getProtocolPoolBalance: () => protocolSeat.getCurrentAllocation(),
-      getMetrics: () => metricsSubscription,
-      getPoolMetrics,
-      ...params,
-    }),
-  );
-
-  const { governorFacet, limitedCreatorFacet } = makeVirtualGovernorFacet(
-    harden({
-      makeCollectFeesInvitation,
-      /**
-       * Must be called before adding pools. Not provided at contract start time
-       * due to cyclic dependency.
-       *
-       * @param {MethodContext} _context
-       * @param {AssetReservePublicFacet} facet
-       */
-      resolveReserveFacet: (_context, facet) => {
-        assert(!reserveFacet, 'reserveFacet already resolved');
-        reserveFacet = facet;
-        baggage.init('reserveFacet', facet);
-      },
-    }),
-  );
-
-  const makeAMM = prepareKindMulti(baggage, 'AMM', initEmpty, {
-    publicFacet,
-    creatorFacet: governorFacet,
-    limitedCreatorFacet,
-  });
-  const { creatorFacet, publicFacet: pFacet } = makeAMM();
-  return { creatorFacet, publicFacet: pFacet };
-};
-
-harden(start);
-export { start };
-
-/**
- * @typedef {object} AMMParamGetters
- * @property {() => NatValue} getPoolFee
- * @property {() => NatValue} getProtocolFee
- * @property {() => Amount<'nat'>} getMinInitialPoolLiquidity
- * @property {() => Amount} getElectorate
- */
-
-/**
- * @typedef { bigint } BasisPoints -- hundredths of a percent
- *
- * @typedef {GovernanceTerms<{
- *   PoolFee: 'nat',
- *   ProtocolFee: 'nat',
- *   MinInitialPoolLiquidity: 'amount',
- * }> & {
- *   brands: { Central: Brand },
- *   issuers: {},
- *   timer: import('@agoric/time/src/types').TimerService,
- *   poolFeeBP: BasisPoints, // portion of the fees that go into the pool
- *   protocolFeeBP: BasisPoints, // portion of the fees that are shared with validators
- * }} AMMTerms
- */
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/params.js b/packages/inter-protocol/src/vpool-xyk-amm/params.js
deleted file mode 100644
index 4f1acba003c..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/params.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
-
-export const POOL_FEE_KEY = 'PoolFee';
-export const PROTOCOL_FEE_KEY = 'ProtocolFee';
-export const MIN_INITIAL_POOL_LIQUIDITY_KEY = 'MinInitialPoolLiquidity';
-
-const DEFAULT_POOL_FEE_BP = 24n;
-const DEFAULT_PROTOCOL_FEE_BP = 6n;
-
-/**
- * @param {Invitation} electorateInvitation - invitation for the question poser
- * @param {bigint} protocolFeeBP
- * @param {bigint} poolFeeBP
- * @param {Amount<'nat'>} minInitialLiquidity
- */
-const makeAmmParams = (
-  electorateInvitation,
-  protocolFeeBP,
-  poolFeeBP,
-  minInitialLiquidity,
-) => {
-  return harden({
-    [POOL_FEE_KEY]: { type: ParamTypes.NAT, value: poolFeeBP },
-    [PROTOCOL_FEE_KEY]: { type: ParamTypes.NAT, value: protocolFeeBP },
-    [MIN_INITIAL_POOL_LIQUIDITY_KEY]: {
-      type: ParamTypes.AMOUNT,
-      value: minInitialLiquidity,
-    },
-    [CONTRACT_ELECTORATE]: {
-      type: ParamTypes.INVITATION,
-      value: electorateInvitation,
-    },
-  });
-};
-
-/** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager').ParamTypesMapFromRecord<ReturnType<typeof makeAmmParams>>} AmmParams */
-
-const makeAmmTerms = (
-  timer,
-  poserInvitationAmount,
-  minInitialLiquidity,
-  protocolFeeBP = DEFAULT_PROTOCOL_FEE_BP,
-  poolFeeBP = DEFAULT_POOL_FEE_BP,
-) => ({
-  timer,
-  poolFeeBP,
-  protocolFeeBP,
-  governedParams: makeAmmParams(
-    poserInvitationAmount,
-    protocolFeeBP,
-    poolFeeBP,
-    minInitialLiquidity,
-  ),
-});
-
-harden(makeAmmTerms);
-harden(makeAmmParams);
-
-export { makeAmmTerms, makeAmmParams };
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/pool.js b/packages/inter-protocol/src/vpool-xyk-amm/pool.js
deleted file mode 100644
index 24a3f7d2fe5..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/pool.js
+++ /dev/null
@@ -1,398 +0,0 @@
-import '@agoric/zoe/exported.js';
-
-import { AmountMath, isNatValue } from '@agoric/ertp';
-import { makeStoredPublishKit } from '@agoric/notifier';
-import { prepareKindMulti } from '@agoric/vat-data';
-import {
-  calcLiqValueToMint,
-  calcSecondaryRequired,
-  calcValueToRemove,
-  atomicRearrange,
-} from '@agoric/zoe/src/contractSupport/index.js';
-
-import { E } from '@endo/eventual-send';
-import { makeMetricsPublisherKit } from '../contractSupport.js';
-import { makePriceAuthority } from './priceAuthority.js';
-import { makeSinglePool } from './singlePool.js';
-
-// Pools represent a single pool of liquidity. Price calculations and trading
-// happen in a wrapper class that knows whether the proposed trade involves a
-// single pool or multiple hops.
-
-export const publicPrices = prices => {
-  return { amountIn: prices.swapperGives, amountOut: prices.swapperGets };
-};
-
-/** @typedef {{ liquidityIssuerRecord: IssuerRecord<'nat'> }} InitPublication */
-
-/** @typedef {{ central: Amount, secondary: Amount }} NotificationState */
-
-/**
- * @typedef {Readonly<{
- * poolSeat: ZCFSeat,
- * secondaryBrand: Brand<'nat'>,
- * liquidityZcfMint: ZCFMint,
- * }>} ImmutableState
- */
-
-/** @typedef {{liqTokenSupply: bigint}} MutableState */
-
-/**
- * @typedef {{
- *   addLiquidityInternal: AddLiquidityInternal,
- *   addLiquidityActual: AddLiquidityActual,
- *   updateMetrics: () => void,
- * }} HelperFacet
- */
-
-/**
- * @typedef {{
- *   state: ImmutableState & MutableState,
- *   facets: {
- *     helper: HelperFacet,
- *     pool: XYKPool,
- *     singlePool: VirtualPool,
- *   },
- * }} MethodContext
- *
- * @typedef {object} PoolMetricsNotification
- * @property {Amount} centralAmount
- * @property {Amount} secondaryAmount
- * @property {Amount} liquidityTokens - outstanding tokens
- */
-
-/** @typedef {import('@agoric/vat-data').Baggage} Baggage */
-/** @typedef {import('./multipoolMarketMaker.js').AmmPowers} AmmPowers */
-
-/**
- * @param {Baggage} baggage
- * @param {AmmPowers} ammPowers
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
- */
-export const definePoolKind = (baggage, ammPowers, storageNode, marshaller) => {
-  /** @type {StoredPublishKit<NotificationState>} */
-  const { subscriber, publisher } = makeStoredPublishKit(
-    storageNode,
-    marshaller,
-  );
-  /** @type {import('../contractSupport.js').MetricsPublisherKit<PoolMetricsNotification>} */
-  const { metricsPublication, metricsSubscription } = makeMetricsPublisherKit(
-    storageNode,
-    marshaller,
-  );
-
-  /**
-   * @param {ZCFMint<'nat'>} liquidityZcfMint
-   * @param {ZCFSeat} poolSeat
-   * @param {Brand<'nat'>} secondaryBrand
-   * @returns {ImmutableState & MutableState}
-   */
-  const poolInit = (liquidityZcfMint, poolSeat, secondaryBrand) => {
-    /** @type {StoredPublishKit<InitPublication>} */
-    const { publisher: initPublisher } = makeStoredPublishKit(
-      E(storageNode).makeChildNode('init'),
-      marshaller,
-    );
-    initPublisher.finish({
-      liquidityIssuerRecord: liquidityZcfMint.getIssuerRecord(),
-    });
-
-    return {
-      liqTokenSupply: 0n,
-      poolSeat,
-      secondaryBrand,
-      liquidityZcfMint,
-    };
-  };
-
-  /** @param {MethodContext} context */
-  const makePriceGetters = context => {
-    const getPAInputPrice = (amountIn, brandOut) => {
-      return publicPrices(
-        context.facets.singlePool.getPriceForInput(
-          amountIn,
-          AmountMath.makeEmpty(brandOut),
-        ),
-      );
-    };
-    const getPAOutputPrice = (brandIn, amountout) =>
-      publicPrices(
-        context.facets.singlePool.getPriceForOutput(
-          AmountMath.makeEmpty(brandIn),
-          amountout,
-        ),
-      );
-    return { getPAInputPrice, getPAOutputPrice };
-  };
-
-  let toCentralPriceAuthority;
-  const provideToCentralPriceAuthority = context => {
-    if (!toCentralPriceAuthority) {
-      const { getPAInputPrice, getPAOutputPrice } = makePriceGetters(context);
-      const { secondaryBrand } = context.state;
-      const { quoteIssuerKit } = ammPowers;
-      toCentralPriceAuthority = makePriceAuthority(
-        getPAInputPrice,
-        getPAOutputPrice,
-        secondaryBrand,
-        ammPowers.centralBrand,
-        ammPowers.timer,
-        subscriber,
-        quoteIssuerKit,
-      );
-    }
-    return toCentralPriceAuthority;
-  };
-
-  let fromCentralPriceAuthority;
-  const provideFromCentralPriceAuthority = context => {
-    if (!fromCentralPriceAuthority) {
-      const { getPAInputPrice, getPAOutputPrice } = makePriceGetters(context);
-      const { secondaryBrand } = context.state;
-      const quoteIssuerKit = ammPowers.quoteIssuerKit;
-      fromCentralPriceAuthority = makePriceAuthority(
-        getPAInputPrice,
-        getPAOutputPrice,
-        ammPowers.centralBrand,
-        secondaryBrand,
-        ammPowers.timer,
-        subscriber,
-        quoteIssuerKit,
-      );
-    }
-    return fromCentralPriceAuthority;
-  };
-
-  const poolBehavior = {
-    getLiquiditySupply: ({ state: { liqTokenSupply } }) => liqTokenSupply,
-    getLiquidityIssuer: ({ state: { liquidityZcfMint } }) =>
-      liquidityZcfMint.getIssuerRecord().issuer,
-    getPoolSeat: ({ state: { poolSeat } }) => poolSeat,
-    getCentralAmount: ({ state: { poolSeat } }) =>
-      poolSeat.getAmountAllocated('Central', ammPowers.centralBrand),
-    getSecondaryAmount: ({ state }) =>
-      state.poolSeat.getAmountAllocated('Secondary', state.secondaryBrand),
-
-    /**
-     * @param {MethodContext} context
-     * @param {ZCFSeat} zcfSeat
-     * @returns {string}
-     */
-    addLiquidity: ({ state, facets }, zcfSeat) => {
-      const { helper, pool } = facets;
-      const centralIn = zcfSeat.getStagedAllocation().Central;
-      assert(isNatValue(centralIn.value), 'User Central');
-      const secondaryIn = zcfSeat.getStagedAllocation().Secondary;
-      assert(isNatValue(secondaryIn.value), 'User Secondary');
-
-      if (state.liqTokenSupply === 0n) {
-        return helper.addLiquidityActual(pool, zcfSeat, secondaryIn, centralIn);
-      }
-
-      const centralPoolAmount = pool.getCentralAmount();
-      const secondaryPoolAmount = pool.getSecondaryAmount();
-      assert(isNatValue(centralPoolAmount.value), 'Pool Central');
-      assert(isNatValue(secondaryPoolAmount.value), 'Pool Secondary');
-
-      // To calculate liquidity, we'll need to calculate alpha from the primary
-      // token's value before, and the value that will be added to the pool
-      const secondaryRequired = AmountMath.make(
-        state.secondaryBrand,
-        calcSecondaryRequired(
-          centralIn.value,
-          centralPoolAmount.value,
-          secondaryPoolAmount.value,
-          secondaryIn.value,
-        ),
-      );
-
-      // Central was specified precisely so offer must provide enough secondary.
-      assert(
-        AmountMath.isGTE(secondaryIn, secondaryRequired),
-        'insufficient Secondary deposited',
-      );
-
-      return helper.addLiquidityActual(
-        pool,
-        zcfSeat,
-        secondaryRequired,
-        centralPoolAmount,
-      );
-    },
-    removeLiquidity: ({ state, facets }, userSeat) => {
-      const { liquidityZcfMint, poolSeat, secondaryBrand } = state;
-      const liquidityBrand = liquidityZcfMint.getIssuerRecord().brand;
-      const liquidityIn = userSeat.getAmountAllocated(
-        'Liquidity',
-        liquidityBrand,
-      );
-      if (AmountMath.isEmpty(liquidityIn)) {
-        // prevent divide-by-zero. If the caller has tokens, the pool is not empty
-        userSeat.exit();
-        return 'request to remove zero liquidity';
-      }
-
-      const liquidityValueIn = liquidityIn.value;
-      assert(isNatValue(liquidityValueIn), 'User Liquidity');
-      const centralTokenAmountOut = AmountMath.make(
-        ammPowers.centralBrand,
-        calcValueToRemove(
-          state.liqTokenSupply,
-          facets.pool.getCentralAmount().value,
-          liquidityValueIn,
-        ),
-      );
-
-      const tokenKeywordAmountOut = AmountMath.make(
-        secondaryBrand,
-        calcValueToRemove(
-          state.liqTokenSupply,
-          facets.pool.getSecondaryAmount().value,
-          liquidityValueIn,
-        ),
-      );
-
-      atomicRearrange(
-        ammPowers.zcf,
-        harden([
-          [userSeat, poolSeat, { Liquidity: liquidityIn }],
-          [
-            poolSeat,
-            userSeat,
-            {
-              Central: centralTokenAmountOut,
-              Secondary: tokenKeywordAmountOut,
-            },
-          ],
-        ]),
-      );
-
-      state.liqTokenSupply -= liquidityValueIn;
-
-      userSeat.exit();
-      facets.pool.updateState();
-      return 'Liquidity successfully removed.';
-    },
-    getSubscriber: () => subscriber,
-    /**
-     * Update metrics and primary state
-     *
-     * @param {MethodContext} context
-     */
-    updateState: ({ facets: { pool, helper } }) => {
-      helper.updateMetrics();
-      publisher.publish({
-        central: pool.getCentralAmount(),
-        secondary: pool.getSecondaryAmount(),
-      });
-    },
-
-    /** @deprecated priceAuthorities will not be provided by the AMM */
-    getToCentralPriceAuthority: provideToCentralPriceAuthority,
-    /** @deprecated priceAuthorities will not be provided by the AMM */
-    getFromCentralPriceAuthority: provideFromCentralPriceAuthority,
-
-    /** @param {MethodContext} context */
-    getVPool: ({ facets }) => facets.singlePool,
-    getMetrics: () => metricsSubscription,
-  };
-
-  /** @param {MethodContext} context */
-  const finish = context => {
-    context.facets.helper.updateMetrics();
-  };
-
-  const helperBehavior = {
-    /** @type {import('@agoric/vat-data/src/types').PlusContext<MethodContext, AddLiquidityInternal>} */
-    addLiquidityInternal: (
-      { state },
-      zcfSeat,
-      secondaryAmount,
-      poolCentralAmount,
-      feeSeat,
-    ) => {
-      const { poolSeat, liquidityZcfMint } = state;
-      // addLiquidity can't be called until the pool has been created. We verify
-      // that the asset is NAT before creating a pool.
-
-      const liquidityValueOut = calcLiqValueToMint(
-        state.liqTokenSupply,
-        // @ts-expect-error value could be not Nat
-        zcfSeat.getStagedAllocation().Central.value,
-        poolCentralAmount.value,
-      );
-
-      const liquidityAmountOut = AmountMath.make(
-        liquidityZcfMint.getIssuerRecord().brand,
-        liquidityValueOut,
-      );
-      liquidityZcfMint.mintGains(
-        harden({ Liquidity: liquidityAmountOut }),
-        poolSeat,
-      );
-      state.liqTokenSupply += liquidityValueOut;
-
-      poolSeat.incrementBy(
-        zcfSeat.decrementBy(
-          harden({
-            Central: zcfSeat.getStagedAllocation().Central,
-            Secondary: secondaryAmount,
-          }),
-        ),
-      );
-
-      zcfSeat.incrementBy(
-        poolSeat.decrementBy(harden({ Liquidity: liquidityAmountOut })),
-      );
-      if (feeSeat) {
-        ammPowers.zcf.reallocate(poolSeat, zcfSeat, feeSeat);
-      } else {
-        ammPowers.zcf.reallocate(poolSeat, zcfSeat);
-      }
-    },
-    /** @type {import('@agoric/vat-data/src/types').PlusContext<MethodContext, AddLiquidityActual>} */
-    addLiquidityActual: (
-      { facets },
-      pool,
-      zcfSeat,
-      secondaryAmount,
-      poolCentralAmount,
-      feeSeat,
-    ) => {
-      const { helper } = facets;
-
-      helper.addLiquidityInternal(
-        zcfSeat,
-        secondaryAmount,
-        poolCentralAmount,
-        feeSeat,
-      );
-      zcfSeat.exit();
-      facets.pool.updateState();
-      return 'Added liquidity.';
-    },
-    /** @param {MethodContext} context */
-    updateMetrics: context => {
-      const { state, facets } = context;
-      const payload = harden({
-        centralAmount: facets.pool.getCentralAmount(),
-        secondaryAmount: facets.pool.getSecondaryAmount(),
-        liquidityTokens: AmountMath.make(
-          state.liquidityZcfMint.getIssuerRecord().brand,
-          state.liqTokenSupply,
-        ),
-      });
-
-      metricsPublication.updateState(payload);
-    },
-  };
-
-  const facets = harden({
-    helper: helperBehavior,
-    pool: poolBehavior,
-    singlePool: makeSinglePool(ammPowers),
-  });
-
-  return prepareKindMulti(baggage, 'pool', poolInit, facets, { finish });
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js b/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js
deleted file mode 100644
index c95521747ea..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/priceAuthority.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { AmountMath } from '@agoric/ertp';
-import {
-  makeNotifierFromSubscriber,
-  observeIteration,
-  subscribeLatest,
-} from '@agoric/notifier';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-
-import { makeOnewayPriceAuthorityKit } from '@agoric/zoe/src/contractSupport/index.js';
-
-/**
- *
- * @param {*} getOutputForGivenInput
- * @param {*} getInputForWantedOutput
- * @param {Brand<'nat'>} actualBrandIn
- * @param {Brand<'nat'>} actualBrandOut
- * @param {import('@agoric/time/src/types').TimerService} timer
- * @param {Subscriber<import('./pool').NotificationState>} subscriber
- * @param {IssuerKit<'set'>} quoteIssuerKit
- * @returns {PriceAuthority}
- */
-export const makePriceAuthority = (
-  getOutputForGivenInput,
-  getInputForWantedOutput,
-  actualBrandIn,
-  actualBrandOut,
-  timer,
-  subscriber,
-  quoteIssuerKit,
-) => {
-  const { brand, issuer: quoteIssuer } = quoteIssuerKit;
-
-  /** @param {PriceQuoteValue} quote */
-  const authenticateQuote = quote => {
-    const quoteAmount = AmountMath.make(brand, harden(quote));
-    const quotePayment = quoteIssuerKit.mint.mintPayment(quoteAmount);
-    return harden({ quoteAmount, quotePayment });
-  };
-
-  // called by createQuote for each trigger to compare price to trigger level
-  const calcAmountOut = amountIn =>
-    getOutputForGivenInput(amountIn, actualBrandOut).amountOut;
-  const calcAmountIn = amountOut =>
-    getInputForWantedOutput(actualBrandIn, amountOut).amountIn;
-
-  /**
-   * @param {PriceQuery} priceQuery
-   * @returns {ERef<PriceQuote> | undefined}
-   */
-  function createQuote(priceQuery) {
-    const quote = priceQuery(calcAmountOut, calcAmountIn);
-    if (!quote) {
-      return undefined;
-    }
-
-    const { amountIn, amountOut } = quote;
-    return E(timer)
-      .getCurrentTimestamp()
-      .then(now =>
-        authenticateQuote([{ amountIn, amountOut, timer, timestamp: now }]),
-      );
-  }
-
-  const priceAuthorityOptions = harden({
-    timer,
-    createQuote,
-    actualBrandIn,
-    actualBrandOut,
-    quoteIssuer,
-    notifier: makeNotifierFromSubscriber(subscriber),
-  });
-
-  const {
-    priceAuthority,
-    adminFacet: { fireTriggers },
-  } = makeOnewayPriceAuthorityKit(priceAuthorityOptions);
-
-  // An observer on a notifier that gets updated when the pool's balances
-  // change via swap or liquidity operations. It checks the comparison predicate
-  // for each active trigger. Due to `subscribeLatest` below it may drop
-  // intermediate values.
-  const priceObserver = Far('priceObserver', {
-    updateState: () => {
-      void fireTriggers(createQuote);
-    },
-  });
-
-  void observeIteration(subscribeLatest(subscriber), priceObserver);
-
-  return priceAuthority;
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js b/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js
deleted file mode 100644
index 6cad9af8945..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/removeLiquidity.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
-
-import '@agoric/zoe/exported.js';
-
-/**
- * @param {ZCF} zcf
- * @param {(brand: Brand) => XYKPool} getPool
- */
-export const makeMakeRemoveLiquidityInvitation = (zcf, getPool) => {
-  const removeLiquidity = seat => {
-    assertProposalShape(seat, {
-      want: {
-        Central: null,
-        Secondary: null,
-      },
-      give: {
-        Liquidity: null,
-      },
-    });
-    // Get the brand of the secondary token so we can identify the liquidity pool.
-    const secondaryBrand = seat.getProposal().want.Secondary.brand;
-    const pool = getPool(secondaryBrand);
-    return pool.removeLiquidity(seat);
-  };
-
-  const makeRemoveLiquidityInvitation = () =>
-    zcf.makeInvitation(removeLiquidity, 'autoswap remove liquidity');
-  return makeRemoveLiquidityInvitation;
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js b/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js
deleted file mode 100644
index c47f90252e4..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/singlePool.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import {
-  atomicRearrange,
-  fromOnly,
-  toOnly,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import { makeFeeRatio } from './constantProduct/calcFees.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from './constantProduct/calcSwapPrices.js';
-
-const getSecondaryBrand = pool => pool.getSecondaryAmount().brand;
-const getCentralBrand = pool => pool.getCentralAmount().brand;
-
-const getPools = pool => ({
-  Central: pool.getCentralAmount(),
-  Secondary: pool.getSecondaryAmount(),
-});
-
-export const makeSinglePool = ammPowers => ({
-  allocateGainsAndLosses: (context, seat, prices) => {
-    const { pool } = context.facets;
-    const { poolSeat } = context.state;
-    const { zcf, protocolSeat } = ammPowers;
-    const inBrand = prices.swapperGives.brand;
-
-    /** @type {import('@agoric/zoe/src/contractSupport/atomicTransfer.js').TransferPart[]} */
-    const xfer = harden(
-      inBrand === getSecondaryBrand(pool)
-        ? [
-            fromOnly(poolSeat, { Central: prices.yDecrement }),
-            toOnly(poolSeat, { Secondary: prices.xIncrement }),
-          ]
-        : [
-            fromOnly(poolSeat, { Secondary: prices.yDecrement }),
-            toOnly(poolSeat, { Central: prices.xIncrement }),
-          ],
-    );
-
-    atomicRearrange(
-      zcf,
-      harden([
-        fromOnly(seat, { In: prices.swapperGives }),
-
-        toOnly(seat, { Out: prices.swapperGets }),
-        toOnly(protocolSeat, { Fee: prices.protocolFee }),
-
-        ...xfer,
-      ]),
-    );
-    seat.exit();
-    pool.updateState();
-    return `Swap successfully completed.`;
-  },
-
-  /**
-   * @param {import('./pool').MethodContext} context
-   * @param {Amount} amountIn
-   * @param {Amount} amountOut
-   */
-  getPriceForInput: ({ facets }, amountIn, amountOut) => {
-    const { params } = ammPowers;
-    return pricesForStatedInput(
-      amountIn,
-      getPools(facets.pool),
-      amountOut,
-      makeFeeRatio(params.getProtocolFee(), getCentralBrand(facets.pool)),
-      makeFeeRatio(params.getPoolFee(), amountOut.brand),
-    );
-  },
-
-  /**
-   * @param {import('./pool').MethodContext} context
-   * @param {Amount} amountIn
-   * @param {Amount} amountOut
-   */
-  getPriceForOutput: ({ facets }, amountIn, amountOut) => {
-    const { params } = ammPowers;
-    return pricesForStatedOutput(
-      amountIn,
-      getPools(facets.pool),
-      amountOut,
-      makeFeeRatio(params.getProtocolFee(), getCentralBrand(facets.pool)),
-      makeFeeRatio(params.getPoolFee(), amountIn.brand),
-    );
-  },
-});
-harden(makeSinglePool);
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/swap.js b/packages/inter-protocol/src/vpool-xyk-amm/swap.js
deleted file mode 100644
index 228b0b03c99..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/swap.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
-
-import '@agoric/zoe/exported.js';
-import { AmountMath } from '@agoric/ertp';
-
-/**
- * @param {ZCF} zcf
- * @param {(brandIn: Brand, brandOut: Brand) => VirtualPool} provideVPool
- */
-export const makeMakeSwapInvitation = (zcf, provideVPool) => {
-  /**
-   * trade with a stated amountIn.
-   *
-   * @param {ZCFSeat} seat
-   * @param {{ stopAfter: Amount }} args
-   */
-  const swapIn = (seat, args) => {
-    assertProposalShape(seat, {
-      give: { In: null },
-      want: { Out: null },
-    });
-    const {
-      give: { In: amountIn },
-      want: { Out: amountOut },
-    } = seat.getProposal();
-    if (args) {
-      AmountMath.coerce(amountOut.brand, args.stopAfter);
-      // TODO check that there are no other keys
-    }
-
-    const pool = provideVPool(amountIn.brand, amountOut.brand);
-    let prices;
-    const stopAfter = args && args.stopAfter;
-    if (stopAfter) {
-      AmountMath.coerce(amountOut.brand, stopAfter);
-      prices = pool.getPriceForOutput(amountIn, stopAfter);
-    }
-    if (!prices || !AmountMath.isGTE(prices.swapperGets, stopAfter)) {
-      // `amountIn` is not enough to sell for stopAfter so just sell it all
-      prices = pool.getPriceForInput(amountIn, amountOut);
-    }
-    assert(amountIn.brand === prices.swapperGives.brand);
-    return pool.allocateGainsAndLosses(seat, prices);
-  };
-
-  // trade with a stated amount out.
-  const swapOut = seat => {
-    assertProposalShape(seat, {
-      give: { In: null },
-      want: { Out: null },
-    });
-    const {
-      give: { In: amountIn },
-      want: { Out: amountOut },
-    } = seat.getProposal();
-    const pool = provideVPool(amountIn.brand, amountOut.brand);
-    const prices = pool.getPriceForOutput(amountIn, amountOut);
-    return pool.allocateGainsAndLosses(seat, prices);
-  };
-
-  const makeSwapInInvitation = () =>
-    zcf.makeInvitation(swapIn, 'autoswap swapIn');
-
-  const makeSwapOutInvitation = () =>
-    zcf.makeInvitation(swapOut, 'autoswap swapOut');
-
-  return { makeSwapInInvitation, makeSwapOutInvitation };
-};
diff --git a/packages/inter-protocol/src/vpool-xyk-amm/types.js b/packages/inter-protocol/src/vpool-xyk-amm/types.js
deleted file mode 100644
index d607bb2e0db..00000000000
--- a/packages/inter-protocol/src/vpool-xyk-amm/types.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @typedef {object} VPoolPriceQuote
- * @property {Amount<'nat'>} amountIn
- * @property {Amount<'nat'>} amountOut
- */
-
-/**
- * @typedef {object} SinglePoolSwapResult
- *
- * @property {Amount<'nat'>} xIncrement
- * @property {Amount<'nat'>} swapperGives
- * @property {Amount<'nat'>} yDecrement
- * @property {Amount<'nat'>} swapperGets
- * @property {Amount<'nat'>} protocolFee
- * @property {Amount<'nat'>} poolFee
- * @property {Amount<'nat'>} newY
- * @property {Amount<'nat'>} newX
- */
-
-/**
- * @typedef {import('./multipoolMarketMaker.js').MetricsNotification} MetricsNotification
- * @typedef {import('./pool.js').PoolMetricsNotification} PoolMetricsNotification
- */
-
-/**
- * @typedef {object} DoublePoolSwapResult
- * @property {Amount<'nat'>} swapperGives
- * @property {Amount<'nat'>} swapperGets
- * @property {Amount<'nat'>} inPoolIncrement
- * @property {Amount<'nat'>} inPoolDecrement
- * @property {Amount<'nat'>} outPoolIncrement
- * @property {Amount<'nat'>} outPoolDecrement
- * @property {Amount<'nat'>} protocolFee
- */
-
-/**
- * @typedef {Arity extends 'single' ? SinglePoolSwapResult
- * : Arity extends 'double' ? DoublePoolSwapResult
- * : SinglePoolSwapResult | DoublePoolSwapResult} SwapResult
- * @template {'single' | 'double' | unknown} Arity
- */
-
-/**
- * @typedef {object} VirtualPool - virtual pool for price quotes and trading
- * @property {(seat: ZCFSeat, prices: SwapResult<Arity>) => string} allocateGainsAndLosses
- * @property {(amountIn: Amount, amountOut: Amount) => SwapResult<Arity>} getPriceForInput
- * @property {(amountIn: Amount, amountOut: Amount) => SwapResult<Arity>} getPriceForOutput
- * @template {'single' | 'double' | unknown} [Arity=unknown]
- */
-
-/**
- * @callback AddLiquidityActual
- * @param {XYKPool} pool
- * @param {ZCFSeat} zcfSeat
- * @param {Amount<'nat'>} secondaryAmount
- * @param {Amount<'nat'>} poolCentralAmount
- * @param {ZCFSeat} [feeSeat]
- * @returns {string}
- */
-
-/**
- * @callback AddLiquidityInternal
- * @param {ZCFSeat} zcfSeat
- * @param {Amount<'nat'>} secondaryAmount
- * @param {Amount<'nat'>} poolCentralAmount
- * @param {ZCFSeat} [feeSeat]
- */
-
-/**
- * @typedef {object} XYKPool
- * @property {() => bigint} getLiquiditySupply
- * @property {() => Issuer<'nat'>} getLiquidityIssuer
- * @property {(seat: ZCFSeat) => string} addLiquidity
- * @property {(seat: ZCFSeat) => string} removeLiquidity
- * @property {() => ZCFSeat} getPoolSeat
- * @property {() => Amount<'nat'>} getSecondaryAmount
- * @property {() => Amount<'nat'>} getCentralAmount
- * @property {() => Subscriber<Record<string, Amount>>} getSubscriber
- * @property {() => void} updateState
- * @property {() => PriceAuthority} getToCentralPriceAuthority
- * @property {() => PriceAuthority} getFromCentralPriceAuthority
- * @property {() => VirtualPool} getVPool
- * @property {() => StoredSubscription<PoolMetricsNotification>} getMetrics
- */
-
-/**
- * @typedef {object} PoolFacets
- * @property {XYKPool} pool
- * @property {{addLiquidityActual: AddLiquidityActual, addLiquidityInternal: AddLiquidityInternal}} helper
- * @property {VirtualPool<'single'>} singlePool
- */
-
-/**
- * @typedef {object} XYKAMMCreatorFacet
- * @property {() => Promise<Invitation>} makeCollectFeesInvitation
- * @property {(facet: AssetReservePublicFacet) => void} resolveReserveFacet
- */
-
-/**
- * @typedef {object} XYKAMMPublicFacet
- * @property {() => Promise<Invitation>} addPoolInvitation
- * add a new liquidity pool
- * @property {(secondaryIssuer: ERef<Issuer>, keyword: Keyword) => Promise<Issuer<'nat'>>} addIssuer
- * @property {() => Promise<Invitation>} makeSwapInvitation synonym for
- * makeSwapInInvitation
- * @property {() => Promise<Invitation>} makeSwapInInvitation make an invitation
- * that allows one to do a swap in which the In amount is specified and the Out
- * amount is calculated
- * @property {() => Promise<Invitation>} makeSwapOutInvitation make an invitation
- * that allows one to do a swap in which the Out amount is specified and the In
- * amount is calculated
- * @property {() => Promise<Invitation>} makeAddLiquidityInvitation make an
- * invitation that allows one to add liquidity to the pool.
- * @property {() => Promise<Invitation>} makeAddLiquidityAtRateInvitation make
- * an invitation that allows one to add liquidity to the pool at an arbitrary
- * ratio of collateral to Central.
- * @property {() => Promise<Invitation>} makeRemoveLiquidityInvitation make an
- * invitation that allows one to remove liquidity from the pool.
- * @property {(brand: Brand<'nat'>) => Issuer<'nat'>} getLiquidityIssuer
- * @property {(brand: Brand<'nat'>) => bigint} getLiquiditySupply get the current value of
- * liquidity in the pool for brand held by investors.
- * @property {(brand: Brand<'nat'>) => Issuer<'nat'>} getSecondaryIssuer
- * @property {(amountIn: Amount, amountOut: Amount) => VPoolPriceQuote} getInputPrice
- * calculate the amount of brandOut that will be returned if the amountIn is
- * offered using makeSwapInInvitation at the current price.
- * @property {(amountOut: Amount, amountIn: Amount) => VPoolPriceQuote} getOutputPrice
- * calculate the amount of brandIn that is required in order to get amountOut
- * using makeSwapOutInvitation at the current price
- * @property {(brand: Brand) => Record<string, Amount<'nat'>>} getPoolAllocation get an
- * AmountKeywordRecord showing the current balances in the pool for brand.
- * @property {() => Issuer<'set'>} getQuoteIssuer - get the Issuer that attests to
- * the prices in the priceQuotes issued by the PriceAuthorities
- * @property {(brand: Brand) => {toCentral: PriceAuthority, fromCentral: PriceAuthority}} getPriceAuthorities
- * get a pair of PriceAuthorities { toCentral, fromCentral } for requesting
- * Prices and notifications about changing prices.
- * @property {() => Brand<'nat'>[]} getAllPoolBrands
- * @property {() => Allocation} getProtocolPoolBalance
- * @property {() => StoredSubscription<MetricsNotification>} getMetrics
- * @property {(brand: Brand) => StoredSubscription<PoolMetricsNotification>} getPoolMetrics
- * @property {() => bigint} getProtocolFee
- * @property {() => bigint} getPoolFee
- * @property {() => Amount<'nat'>} getMinInitialPoolLiquidity
- */
-
-/**
- * @callback MakeAmmParamManager
- * @param {ERef<ZoeService>} zoe
- * @param {bigint} poolFeeBP
- * @param {bigint} protocolFeeBP
- * @param {Invitation} poserInvitation - invitation for the question poser
- * @returns {Promise<ParamManagerFull>}
- */
diff --git a/packages/inter-protocol/test/amm/constantProduct/setupMints.js b/packages/inter-protocol/test/amm/constantProduct/setupMints.js
deleted file mode 100644
index 0b51cc9abc9..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/setupMints.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
-
-export const setupMintKits = () => {
-  const runKit = makeIssuerKit(
-    'RUN',
-    AssetKind.NAT,
-    harden({ decimalPlaces: 6 }),
-  );
-  const bldKit = makeIssuerKit(
-    'BLD',
-    AssetKind.NAT,
-    harden({ decimalPlaces: 6 }),
-  );
-  const run = value => AmountMath.make(runKit.brand, value);
-  const bld = value => AmountMath.make(bldKit.brand, value);
-  return { runKit, bldKit, run, bld };
-};
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js
deleted file mode 100644
index 8df913885ef..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaX.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { AmountMath } from '@agoric/ertp';
-
-import { calcDeltaXSellingX } from '../../../src/vpool-xyk-amm/constantProduct/core.js';
-import { setupMintKits } from './setupMints.js';
-
-const doTest = (t, x, y, deltaY, expectedDeltaX) => {
-  const { run, bld } = setupMintKits();
-  const result = calcDeltaXSellingX(run(x), bld(y), bld(deltaY));
-  t.true(
-    AmountMath.isEqual(result, run(expectedDeltaX)),
-    `${result.value} should equal ${expectedDeltaX}`,
-  );
-};
-
-test('0, 0, 0, 0', t => {
-  t.throws(() => doTest(t, 0n, 0n, 0n, 0n), {
-    message: 'No infinite ratios! Denominator was 0 "[Alleged: BLD brand]"',
-  });
-});
-
-test('0, 0, 1, 0', t => {
-  t.throws(() => doTest(t, 0n, 0n, 1n, 0n), {
-    message: '-1 is negative',
-  });
-});
-
-test('1, 0, 0, 0', t => {
-  t.throws(() => doTest(t, 1n, 0n, 0n, 0n), {
-    message: 'No infinite ratios! Denominator was 0 "[Alleged: BLD brand]"',
-  });
-});
-
-test('0, 1, 0, 0', t => {
-  doTest(t, 0n, 1n, 0n, 0n);
-});
-
-test('1, 1, 0, 0', t => {
-  doTest(t, 1n, 1n, 0n, 0n);
-});
-
-test('1, 1, 1, 0', t => {
-  t.throws(() => doTest(t, 1n, 1n, 1n, 0n), {
-    message: 'No infinite ratios! Denominator was 0 "[Alleged: BLD brand]"',
-  });
-});
-
-test('1, 2, 1, 1', t => {
-  doTest(t, 1n, 2n, 1n, 1n);
-});
-
-test('2, 3, 1, 1', t => {
-  doTest(t, 2n, 3n, 1n, 1n);
-});
-
-test('928861206, 130870247, 746353662, 158115257', t => {
-  doTest(t, 928_861_206n, 5_130_870_247n, 746_353_662n, 1_581_152_57n);
-});
-
-test('9, 17, 3, 2', t => {
-  doTest(t, 9n, 17n, 3n, 2n);
-});
-
-test('10000, 5000, 209, 437', t => {
-  doTest(t, 10000n, 5000n, 209n, 437n);
-});
-
-test('1000000, 5000, 209, 1', t => {
-  doTest(t, 1_000_000n, 5000n, 209n, 43624n);
-});
-
-test('5000, 1000000, 209, 2', t => {
-  doTest(t, 5000n, 1000000n, 209n, 2n);
-});
-
-test('500_000, 1000_000, 209 or 210', t => {
-  doTest(t, 500_000n, 1000_000n, 209n, 105n);
-  doTest(t, 500_000n, 1000_000n, 210n, 106n);
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js b/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js
deleted file mode 100644
index 5f04c15742a..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-calcDeltaY.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { AmountMath } from '@agoric/ertp';
-
-import { calcDeltaYSellingX } from '../../../src/vpool-xyk-amm/constantProduct/core.js';
-import { setupMintKits } from './setupMints.js';
-
-const doTest = (t, x, y, deltaX, expectedDeltaY) => {
-  const { run, bld } = setupMintKits();
-  const result = calcDeltaYSellingX(run(x), bld(y), run(deltaX));
-  t.true(
-    AmountMath.isEqual(result, bld(expectedDeltaY)),
-    `${result.value} equals ${expectedDeltaY}`,
-  );
-};
-
-// deltaXPlusX is 0
-test('0, 0, 0, 0', t => {
-  t.throws(() => doTest(t, 0n, 0n, 0n, 0n), {
-    message: 'No infinite ratios! Denominator was 0 "[Alleged: RUN brand]"',
-  });
-});
-
-test('0, 0, 1, 0', t => {
-  doTest(t, 0n, 0n, 1n, 0n);
-});
-
-test('1, 0, 0, 0', t => {
-  doTest(t, 1n, 0n, 0n, 0n);
-});
-
-// deltaXPlusX is 0
-test('0, 1, 0, 0', t => {
-  t.throws(() => doTest(t, 0n, 1n, 0n, 0n), {
-    message: 'No infinite ratios! Denominator was 0 "[Alleged: RUN brand]"',
-  });
-});
-
-test('1, 1, 0, 0', t => {
-  doTest(t, 1n, 1n, 0n, 0n);
-});
-
-test('1, 1, 1, 0', t => {
-  doTest(t, 1n, 1n, 1n, 0n);
-});
-
-test('1, 2, 1, 1', t => {
-  doTest(t, 1n, 2n, 1n, 1n);
-});
-
-test('2, 3, 4, 2', t => {
-  doTest(t, 2n, 3n, 4n, 2n);
-});
-
-test('928861206, 130870247, 746353662, 58306244', t => {
-  doTest(t, 928861206n, 130870247n, 746353662n, 58306244n);
-});
-
-test('9, 3, 17, 1', t => {
-  doTest(t, 9n, 3n, 17n, 1n);
-});
-
-test('10000, 5000, 209, 102', t => {
-  doTest(t, 10000n, 5000n, 209n, 102n);
-});
-
-test('1000000, 5000, 209, 1', t => {
-  doTest(t, 1000000n, 5000n, 209n, 1n);
-});
-
-test('5000, 1000000, 209, 40122', t => {
-  doTest(t, 5000n, 1000000n, 209n, 40122n);
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-checkInvariants.js b/packages/inter-protocol/test/amm/constantProduct/test-checkInvariants.js
deleted file mode 100644
index 714d79e3315..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-checkInvariants.js
+++ /dev/null
@@ -1,443 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { AmountMath } from '@agoric/ertp';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { BASIS_POINTS } from '../../../src/vpool-xyk-amm/constantProduct/defaults.js';
-import { setupMintKits } from './setupMints.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from '../../../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js';
-import { checkKInvariantSellingX } from '../../../src/vpool-xyk-amm/constantProduct/invariants.js';
-import { getXY } from '../../../src/vpool-xyk-amm/constantProduct/getXY.js';
-
-/**
- * @typedef {object} SwapPriceArgs
- * @property {Amount} amountGiven
- * @property {PoolAllocation} poolAllocation
- * @property {Amount} [amountWanted]
- * @property {Ratio} protocolFeeRatio
- * @property {Ratio} poolFeeRatio
- */
-
-const prepareRUNInTest = ({
-  inputReserve,
-  outputReserve,
-  inputValue,
-  outputValue,
-}) => {
-  const { run, bld, runKit, bldKit } = setupMintKits();
-  const amountGiven = run(inputValue || 0n);
-  const poolAllocation = harden({
-    Central: run(inputReserve),
-    Secondary: bld(outputReserve),
-  });
-  const amountWanted = bld(outputValue || 0n);
-  const protocolFeeRatio = makeRatio(5n, runKit.brand, BASIS_POINTS);
-  const poolFeeRatio = makeRatio(25n, bldKit.brand, BASIS_POINTS);
-
-  return harden([
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  ]);
-};
-
-const prepareRUNOutTest = ({
-  inputReserve,
-  outputReserve,
-  inputValue,
-  outputValue,
-}) => {
-  const { run, bld, runKit, bldKit } = setupMintKits();
-  const amountGiven = bld(inputValue || 0n);
-  const poolAllocation = harden({
-    Central: run(inputReserve),
-    Secondary: bld(outputReserve),
-  });
-  const amountWanted = run(outputValue || 0n);
-  const protocolFeeRatio = makeRatio(5n, bldKit.brand, BASIS_POINTS);
-  const poolFeeRatio = makeRatio(25n, runKit.brand, BASIS_POINTS);
-
-  return harden([
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  ]);
-};
-
-function checkGetInput(t, args, result) {
-  t.falsy(AmountMath.isEmpty(result.swapperGets));
-  t.truthy(AmountMath.isGTE(args[0], result.swapperGives));
-  t.truthy(AmountMath.isGTE(result.swapperGets, args[2]));
-  t.falsy(AmountMath.isEmpty(result.poolFee));
-  t.falsy(AmountMath.isEmpty(result.protocolFee));
-
-  t.deepEqual(
-    AmountMath.add(result.xIncrement, result.protocolFee),
-    result.swapperGives,
-  );
-  t.deepEqual(result.yDecrement, result.swapperGets);
-
-  const xyArgs = {
-    amountGiven: args[0],
-    poolAllocation: args[1],
-    amountWanted: args[2],
-  };
-  const { x, y } = getXY(xyArgs);
-  t.truthy(checkKInvariantSellingX(x, y, result.xIncrement, result.yDecrement));
-}
-
-function checkGetOutput(t, args, result) {
-  t.falsy(AmountMath.isEmpty(result.swapperGets));
-  if (!AmountMath.isEmpty(args[0])) {
-    t.truthy(AmountMath.isGTE(args[0], result.swapperGives));
-  }
-  t.truthy(AmountMath.isGTE(result.swapperGets, args[2]));
-  t.falsy(AmountMath.isEmpty(result.poolFee));
-  t.falsy(AmountMath.isEmpty(result.protocolFee));
-
-  t.deepEqual(
-    AmountMath.add(result.xIncrement, result.protocolFee),
-    result.swapperGives,
-  );
-  t.deepEqual(result.yDecrement, result.swapperGets);
-
-  const xyArgs = {
-    amountGiven: args[0],
-    poolAllocation: args[1],
-    amountWanted: args[2],
-  };
-  const { x, y } = getXY(xyArgs);
-  t.truthy(checkKInvariantSellingX(x, y, result.xIncrement, result.yDecrement));
-}
-
-const testGetInputPrice = (t, inputs, runIn) => {
-  const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedInput(...args);
-  checkGetInput(t, args, result);
-};
-
-const testGetInputPriceThrows = (t, inputs, message, runIn) => {
-  t.throws(
-    _ => {
-      const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-      // @ts-expect-error typescript doesn't like param list built by destructuring
-      return pricesForStatedInput(...args);
-    },
-    {
-      message,
-    },
-  );
-};
-
-const testGetInputPriceNoTrade = (t, inputs, runIn) => {
-  const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedInput(...args);
-  t.truthy(AmountMath.isEmpty(result.swapperGets));
-  t.truthy(AmountMath.isEmpty(result.swapperGives));
-};
-
-const testGetOutputPrice = (t, inputs, runIn) => {
-  const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedOutput(...args);
-  checkGetOutput(t, args, result);
-};
-
-const getOutputPriceThrows = (t, inputs, message, runIn) => {
-  t.throws(
-    _ => {
-      const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-      // @ts-expect-error typescript doesn't like param list built by destructuring
-      return pricesForStatedOutput(...args);
-    },
-    {
-      message,
-    },
-  );
-};
-
-const testGetOutputPriceNoTrade = (t, inputs, runIn) => {
-  const args = runIn ? prepareRUNInTest(inputs) : prepareRUNOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedOutput(...args);
-  t.truthy(AmountMath.isEmpty(result.swapperGets));
-  t.truthy(AmountMath.isEmpty(result.swapperGives));
-};
-
-test('getInputPrice no reserves', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 0n,
-    inputValue: 1n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  testGetInputPriceThrows(t, input, message, true);
-  testGetInputPriceThrows(t, input, message, false);
-});
-
-test('getInputPrice ok 2', t => {
-  const input = {
-    inputReserve: 5984n,
-    outputReserve: 3028n,
-    inputValue: 1398n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice ok 2w/output', t => {
-  const input = {
-    inputReserve: 5984n,
-    outputReserve: 3028n,
-    inputValue: 1398n,
-    outputValue: 572n,
-  };
-  testGetInputPriceNoTrade(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice outLimit', t => {
-  const input = {
-    inputReserve: 9348n,
-    outputReserve: 2983n,
-    inputValue: 828n,
-    outputValue: 350n,
-  };
-  testGetInputPriceNoTrade(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice ok 3', t => {
-  const input = {
-    inputReserve: 8160n,
-    outputReserve: 7743n,
-    inputValue: 6635n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice ok 4', t => {
-  const input = {
-    inputReserve: 10n,
-    outputReserve: 10n,
-    inputValue: 1000n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice ok 5', t => {
-  const input = {
-    inputReserve: 100n,
-    outputReserve: 50n,
-    inputValue: 17n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice zero outputValue', t => {
-  const input = {
-    inputReserve: 100n,
-    outputReserve: 50n,
-    inputValue: 17n,
-    outputValue: 0n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice ok 6', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    inputValue: 7n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice negative', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    inputValue: -7n,
-  };
-  const message = 'value "[-7n]" must be a natural number';
-  testGetInputPriceThrows(t, input, message, true);
-  testGetInputPriceThrows(t, input, message, false);
-});
-
-test('getInputPrice bad reserve 1', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 0n,
-    inputValue: 347n,
-  };
-  const message =
-    '"poolAllocation.Secondary" must be greater than 0: {"brand":"[Alleged: BLD brand]","value":"[0n]"}';
-  testGetInputPriceThrows(t, input, message, true);
-  testGetInputPriceThrows(t, input, message, false);
-});
-
-test('getInputPrice bad reserve 2', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 50n,
-    inputValue: 828n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  testGetInputPriceThrows(t, input, message, true);
-  testGetInputPriceThrows(t, input, message, false);
-});
-
-test('getInputPrice zero input', t => {
-  const input = {
-    inputReserve: 320n,
-    outputReserve: 50n,
-    inputValue: 0n,
-    outputValue: 0n,
-  };
-  testGetInputPriceNoTrade(t, input, true);
-  testGetInputPriceNoTrade(t, input, false);
-});
-
-test('getOutputPrice zero output', t => {
-  const input = {
-    inputReserve: 320n,
-    outputReserve: 50n,
-    inputValue: 0n,
-    outputValue: 0n,
-  };
-  testGetOutputPriceNoTrade(t, input, true);
-  testGetOutputPriceNoTrade(t, input, false);
-});
-
-test('getInputPrice big product', t => {
-  const input = {
-    inputReserve: 100_000_000n,
-    outputReserve: 100_000_000n,
-    inputValue: 1000n,
-    outputValue: 50n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getInputPrice README example', t => {
-  const input = {
-    inputReserve: 40_000_000n,
-    outputReserve: 3_000_000n,
-    inputValue: 30_000n,
-    outputValue: 2000n,
-  };
-  testGetInputPrice(t, input, true);
-  testGetInputPrice(t, input, false);
-});
-
-test('getOutputPrice ok', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    outputValue: 37n,
-  };
-  testGetOutputPrice(t, input, true);
-  testGetOutputPrice(t, input, false);
-});
-
-test('getOutputPrice zero output reserve', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 0n,
-    outputValue: 37n,
-  };
-  const message =
-    '"poolAllocation.Secondary" must be greater than 0: {"brand":"[Alleged: BLD brand]","value":"[0n]"}';
-  getOutputPriceThrows(t, input, message, true);
-  getOutputPriceThrows(t, input, message, false);
-});
-
-test('getOutputPrice zero input reserve', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 92n,
-    outputValue: 37n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  getOutputPriceThrows(t, input, message, true);
-  getOutputPriceThrows(t, input, message, false);
-});
-
-test('getOutputPrice too much output', t => {
-  const input = {
-    inputReserve: 1132n,
-    outputReserve: 1024n,
-    outputValue: 20923n,
-  };
-  testGetOutputPriceNoTrade(t, input, true);
-  testGetOutputPriceNoTrade(t, input, false);
-});
-
-test('getOutputPrice too much output 2', t => {
-  const input = {
-    inputReserve: 1132n,
-    outputReserve: 345n,
-    outputValue: 345n,
-  };
-  testGetOutputPriceNoTrade(t, input, true);
-  testGetOutputPrice(t, input, false);
-});
-
-test('getOutputPrice zero inputValue', t => {
-  const input = {
-    inputReserve: 1132n,
-    outputReserve: 3145n,
-    inputValue: 0n,
-    outputValue: 345n,
-  };
-  testGetOutputPrice(t, input, true);
-  testGetOutputPrice(t, input, false);
-});
-
-test('getOutputPrice big product', t => {
-  const input = {
-    inputReserve: 100_000_000n,
-    outputReserve: 100_000_000n,
-    outputValue: 1000n,
-  };
-  testGetOutputPrice(t, input, true);
-  testGetOutputPrice(t, input, false);
-});
-
-test('getOutputPrice minimum price', t => {
-  const input = {
-    inputReserve: 1n,
-    outputReserve: 10n,
-    outputValue: 1n,
-  };
-  testGetOutputPrice(t, input, true);
-  testGetOutputPriceNoTrade(t, input, false);
-});
-
-test('getOutputPrice large values, in/out', t => {
-  const input = {
-    inputReserve: 1_192_432n,
-    outputReserve: 3_298_045n,
-    inputValue: 13_435n,
-    outputValue: 3_435n,
-  };
-  testGetOutputPrice(t, input, true);
-  testGetOutputPrice(t, input, false);
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-compareBondingCurves.js b/packages/inter-protocol/test/amm/constantProduct/test-compareBondingCurves.js
deleted file mode 100644
index 9968763af10..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-compareBondingCurves.js
+++ /dev/null
@@ -1,295 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { BASIS_POINTS } from '../../../src/vpool-xyk-amm/constantProduct/defaults.js';
-import { setupMintKits } from './setupMints.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from '../../../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js';
-
-// This assumes run is swapped in. The test should function the same
-// regardless of what brand is the amountIn, because no run fee is
-// charged.
-const prepareSwapInTest = ({ inputReserve, outputReserve, inputValue }) => {
-  const { run, bld, runKit, bldKit } = setupMintKits();
-  const amountGiven = run(inputValue);
-  const poolAllocation = harden({
-    Central: run(inputReserve),
-    Secondary: bld(outputReserve),
-  });
-  const amountWanted = bld(0n);
-  const protocolFeeRatio = makeRatio(0n, runKit.brand, BASIS_POINTS);
-  const poolFeeRatio = makeRatio(3n, bldKit.brand, BASIS_POINTS);
-
-  const args = [
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  ];
-  return harden({
-    args,
-    run,
-    bld,
-  });
-};
-
-const testInputGetPrice = (t, inputs, expectedOutput) => {
-  const { args, bld } = prepareSwapInTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedInput(...args);
-  t.deepEqual(result.swapperGets, bld(expectedOutput));
-};
-
-const getInputPriceThrows = (t, inputs, message) => {
-  t.throws(
-    _ => {
-      const { args } = prepareSwapInTest(inputs);
-      // @ts-expect-error typescript doesn't like param list built by destructuring
-      return pricesForStatedInput(...args);
-    },
-    {
-      message,
-    },
-  );
-};
-
-// This assumes run is swapped in. The test should function the same
-// regardless of what brand is the amountIn, because no run fee is
-// charged.
-const prepareSwapOutTest = ({ inputReserve, outputReserve, outputValue }) => {
-  const { run, bld, runKit } = setupMintKits();
-  const amountGiven = run(0n);
-  const poolAllocation = harden({
-    Central: run(inputReserve),
-    Secondary: bld(outputReserve),
-  });
-  const amountWanted = bld(outputValue);
-  const protocolFeeRatio = makeRatio(0n, runKit.brand, BASIS_POINTS);
-  const poolFeeRatio = makeRatio(30n, runKit.brand, BASIS_POINTS);
-
-  const args = [
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  ];
-  return harden({
-    args,
-    run,
-    bld,
-  });
-};
-
-const testGetOutputPrice = (t, inputs, expectedInput) => {
-  const { args, run } = prepareSwapOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedOutput(...args);
-  t.deepEqual(result.swapperGives, run(expectedInput));
-};
-
-const getOutputPriceThrows = (t, inputs, message) => {
-  const { args } = prepareSwapOutTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  t.throws(_ => pricesForStatedOutput(...args), {
-    message,
-  });
-};
-
-test('getInputPrice no reserves', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 0n,
-    inputValue: 1n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  getInputPriceThrows(t, input, message);
-});
-
-test('getInputPrice ok 2', t => {
-  const input = {
-    inputReserve: 5984n,
-    outputReserve: 3028n,
-    inputValue: 1398n,
-  };
-  const expectedOutput = 572n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice ok 3', t => {
-  const input = {
-    inputReserve: 8160n,
-    outputReserve: 7743n,
-    inputValue: 6635n,
-  };
-  const expectedOutput = 3470n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice ok 4', t => {
-  const input = {
-    inputReserve: 10n,
-    outputReserve: 10n,
-    inputValue: 1000n,
-  };
-  const expectedOutput = 8n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice ok 5', t => {
-  const input = {
-    inputReserve: 100n,
-    outputReserve: 50n,
-    inputValue: 17n,
-  };
-  const expectedOutput = 6n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice ok 6', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    inputValue: 7n,
-  };
-  const expectedOutput = 15n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice negative', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    inputValue: -7n,
-  };
-  const message = 'value "[-7n]" must be a natural number';
-  getInputPriceThrows(t, input, message);
-});
-
-test('getInputPrice bad reserve 1', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 0n,
-    inputValue: 347n,
-  };
-  const message =
-    '"poolAllocation.Secondary" must be greater than 0: {"brand":"[Alleged: BLD brand]","value":"[0n]"}';
-  getInputPriceThrows(t, input, message);
-});
-
-test('getInputPrice bad reserve 2', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 50n,
-    inputValue: 828n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  getInputPriceThrows(t, input, message);
-});
-
-test('getInputPrice zero input', t => {
-  const input = {
-    inputReserve: 320n,
-    outputReserve: 50n,
-    inputValue: 0n,
-  };
-
-  const expectedOutput = 0n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getOutputPrice zero output', t => {
-  const input = {
-    inputReserve: 320n,
-    outputReserve: 50n,
-    outputValue: 0n,
-  };
-
-  const expectedInput = 0n;
-  testGetOutputPrice(t, input, expectedInput);
-});
-
-test('getInputPrice big product', t => {
-  const input = {
-    inputReserve: 100_000_000n,
-    outputReserve: 100_000_000n,
-    inputValue: 1000n,
-  };
-  const expectedOutput = 998n;
-  testInputGetPrice(t, input, expectedOutput);
-});
-
-test('getOutputPrice ok', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 117n,
-    outputValue: 37n,
-  };
-  const expectedOutput = 21n;
-  testGetOutputPrice(t, input, expectedOutput);
-});
-
-test('getOutputPrice zero output reserve', t => {
-  const input = {
-    inputReserve: 43n,
-    outputReserve: 0n,
-    outputValue: 37n,
-  };
-  const message =
-    '"poolAllocation.Secondary" must be greater than 0: {"brand":"[Alleged: BLD brand]","value":"[0n]"}';
-  getOutputPriceThrows(t, input, message);
-});
-
-test('getOutputPrice zero input reserve', t => {
-  const input = {
-    inputReserve: 0n,
-    outputReserve: 92n,
-    outputValue: 37n,
-  };
-  const message =
-    '"poolAllocation.Central" must be greater than 0: {"brand":"[Alleged: RUN brand]","value":"[0n]"}';
-  getOutputPriceThrows(t, input, message);
-});
-
-test('getOutputPrice too much output', t => {
-  const input = {
-    inputReserve: 1132n,
-    outputReserve: 1024n,
-    outputValue: 20923n,
-  };
-  testGetOutputPrice(t, input, 0n);
-});
-
-test('getOutputPrice too much output 2', t => {
-  const input = {
-    inputReserve: 1132n,
-    outputReserve: 345n,
-    outputValue: 345n,
-  };
-  testGetOutputPrice(t, input, 0n);
-});
-
-test('getOutputPrice big product', t => {
-  const input = {
-    inputReserve: 100_000_000n,
-    outputReserve: 100_000_000n,
-    outputValue: 1000n,
-  };
-  const expectedOutput = 1005n;
-  testGetOutputPrice(t, input, expectedOutput);
-});
-
-test('getOutputPrice minimum price', t => {
-  const input = {
-    inputReserve: 1n,
-    outputReserve: 10n,
-    outputValue: 1n,
-  };
-  const expectedOutput = 2n;
-  testGetOutputPrice(t, input, expectedOutput);
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-estimator.js b/packages/inter-protocol/test/amm/constantProduct/test-estimator.js
deleted file mode 100644
index 8b502a38cef..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-estimator.js
+++ /dev/null
@@ -1,439 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import { Far } from '@endo/marshal';
-import { makeScalarMapStore } from '@agoric/store';
-
-import { charge, makeEstimator } from '../../../src/vpool-xyk-amm/estimate.js';
-import { withAmountUtils } from '../../supports.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from '../../../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js';
-import { BASIS_POINTS } from '../../../src/vpool-xyk-amm/constantProduct/defaults.js';
-import { makeDoublePool } from '../../../src/vpool-xyk-amm/doublePool.js';
-
-const Million = 1000_000n;
-const DEFAULT_2_POOLS = [
-  [Million, Million],
-  [Million, Million],
-];
-const DEFAULT_3_POOLS = [
-  [Million, Million],
-  [Million, Million],
-  [Million, Million],
-];
-
-const makePools = (issuerKits, poolValues) => {
-  const centralBrand = issuerKits[0].brand;
-  const internalPools = makeScalarMapStore('poolBrand');
-  const uiPools = makeScalarMapStore('poolBrand');
-  for (let i = 1; i < issuerKits.length; i += 1) {
-    const brand = issuerKits[i].brand;
-    const internalPool = Far(`pool ${brand.getAllegedName()}`, {
-      getCentralAmount: () => AmountMath.make(centralBrand, poolValues[i][0]),
-      getSecondaryAmount: () => AmountMath.make(brand, poolValues[i][1]),
-    });
-    internalPools.init(brand, internalPool);
-    const uiPool = {
-      secondaryAmount: AmountMath.make(brand, poolValues[i][1]),
-      centralAmount: AmountMath.make(centralBrand, poolValues[i][0]),
-    };
-    uiPools.init(brand, uiPool);
-  }
-  return { internalPools, uiPools };
-};
-
-const getInputPrices = (centralBrand, amountGiven, brandOut, pools, fees) => {
-  const pool =
-    brandOut === centralBrand
-      ? pools.get(amountGiven.brand)
-      : pools.get(brandOut);
-  const poolAllocation = {
-    Central: pool.getCentralAmount(),
-    Secondary: pool.getSecondaryAmount(),
-  };
-  return pricesForStatedInput(
-    amountGiven,
-    poolAllocation,
-    AmountMath.makeEmpty(brandOut),
-    makeRatio(fees.protocolFeeBP, centralBrand, BASIS_POINTS),
-    makeRatio(fees.poolFeeBP, poolAllocation.Secondary.brand, BASIS_POINTS),
-  );
-};
-
-const getTwoPoolInputPrices = (
-  centralBrand,
-  amountGiven,
-  brandOut,
-  pools,
-  fees,
-) => {
-  const pool1 = pools.get(amountGiven.brand);
-  const pool2 = pools.get(brandOut);
-
-  const getPoolFee = () => fees.poolFeeBP;
-  const getProFee = () => fees.protocolFeeBP;
-  const vPool = makeDoublePool(
-    // @ts-expect-error fake
-    undefined,
-    pool1,
-    pool2,
-    getProFee,
-    getPoolFee,
-    undefined,
-  );
-
-  return vPool.getPriceForInput(amountGiven, AmountMath.makeEmpty(brandOut));
-};
-
-const getOutputPrices = (centralBrand, brandIn, amountWanted, pools, fees) => {
-  const pool =
-    brandIn === centralBrand
-      ? pools.get(amountWanted.brand)
-      : pools.get(brandIn);
-  const poolAllocation = {
-    Central: pool.getCentralAmount(),
-    Secondary: pool.getSecondaryAmount(),
-  };
-
-  return pricesForStatedOutput(
-    AmountMath.makeEmpty(brandIn),
-    poolAllocation,
-    amountWanted,
-    makeRatio(fees.protocolFeeBP, centralBrand, BASIS_POINTS),
-    makeRatio(fees.poolFeeBP, poolAllocation.Secondary.brand, BASIS_POINTS),
-  );
-};
-
-function buildRates(protocolFeeBP, poolFeeBP, slippageBP) {
-  return { protocolFeeBP, poolFeeBP, slippageBP };
-}
-
-test('estimate simple swapIn toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 200n);
-
-  const amountGiven = edge.make(1000n);
-  const brandOut = central.brand;
-  const expected = getInputPrices(
-    central.brand,
-    amountGiven,
-    brandOut,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(brandOut, rates);
-  t.deepEqual(
-    estimator.estimateProceeds(amountGiven, brandOut, uiPools),
-    AmountMath.subtract(
-      expected.swapperGets,
-      charge(rates.slippageBP, expected.swapperGets),
-    ),
-  );
-});
-
-test('estimate simple swapIn fromCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 200n);
-
-  const amountGiven = central.make(1000n);
-  const brandOut = edge.brand;
-  const expected = getInputPrices(
-    central.brand,
-    amountGiven,
-    brandOut,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(amountGiven.brand, rates);
-  t.deepEqual(
-    estimator.estimateProceeds(amountGiven, brandOut, uiPools),
-    AmountMath.subtract(
-      expected.swapperGets,
-      charge(rates.slippageBP, expected.swapperGets),
-    ),
-  );
-});
-
-test('estimate simple swapOut fromCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 200n);
-
-  const brandIn = central.brand;
-  const amountWanted = edge.make(1000n);
-
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate simple swapOut toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 200n);
-
-  const brandIn = edge.brand;
-  const amountWanted = central.make(1000n);
-
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high ProtocolFee fromCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(3000n, 20n, 200n);
-
-  const brandIn = central.brand;
-  const amountWanted = edge.make(1000n);
-
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high ProtocolFee toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(3000n, 20n, 200n);
-
-  const brandIn = edge.brand;
-  const amountWanted = central.make(1000n);
-
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high poolFee fromCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(300n, 2000n, 200n);
-
-  const brandIn = central.brand;
-  const amountWanted = edge.make(1000n);
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high poolFee toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(300n, 2000n, 200n);
-
-  const brandIn = edge.brand;
-  const amountWanted = central.make(1000n);
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high slippage fromCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 500n);
-
-  const brandIn = central.brand;
-  const amountWanted = edge.make(1000n);
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate swapOut high slippage toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge = withAmountUtils(makeIssuerKit('edge'));
-  const { internalPools, uiPools } = makePools(
-    [central, edge],
-    DEFAULT_2_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 500n);
-
-  const brandIn = edge.brand;
-  const amountWanted = central.make(1000n);
-  const expected = getOutputPrices(
-    central.brand,
-    brandIn,
-    amountWanted,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateRequired(brandIn, amountWanted, uiPools),
-    AmountMath.add(
-      expected.swapperGives,
-      charge(rates.slippageBP, expected.swapperGives),
-    ),
-  );
-});
-
-test('estimate two pools swapIn toCentral', t => {
-  const central = withAmountUtils(makeIssuerKit('central'));
-  const edge1 = withAmountUtils(makeIssuerKit('edge1'));
-  const edge2 = withAmountUtils(makeIssuerKit('edge2'));
-
-  const { internalPools, uiPools } = makePools(
-    [central, edge1, edge2],
-    DEFAULT_3_POOLS,
-  );
-  const rates = buildRates(30n, 20n, 200n);
-
-  const brandOut = edge2.brand;
-  const amountGiven = edge1.make(1000n);
-
-  const expected = getTwoPoolInputPrices(
-    central.brand,
-    amountGiven,
-    brandOut,
-    internalPools,
-    rates,
-  );
-
-  const estimator = makeEstimator(central.brand, rates);
-  t.deepEqual(
-    estimator.estimateProceeds(amountGiven, brandOut, uiPools),
-    AmountMath.subtract(
-      expected.swapperGets,
-      charge(rates.slippageBP, expected.swapperGets),
-    ),
-  );
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-getXY.js b/packages/inter-protocol/test/amm/constantProduct/test-getXY.js
deleted file mode 100644
index 6a200c2f413..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-getXY.js
+++ /dev/null
@@ -1,131 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { getXY } from '../../../src/vpool-xyk-amm/constantProduct/getXY.js';
-import { setupMintKits } from './setupMints.js';
-
-test('swap Central for Secondary', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = run(2000n);
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = bld(2819n);
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Central);
-  t.deepEqual(y, poolAllocation.Secondary);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
-
-test('swap Central for Secondary no Give', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = undefined;
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = bld(2819n);
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Central);
-  t.deepEqual(y, poolAllocation.Secondary);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
-
-test('swap Central for Secondary no want', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = run(3000n);
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = undefined;
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Central);
-  t.deepEqual(y, poolAllocation.Secondary);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
-
-test('swap Secondary for Central', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = bld(2000n);
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = run(2819n);
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Secondary);
-  t.deepEqual(y, poolAllocation.Central);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
-
-test('swap Secondary for Central no want', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = bld(2000n);
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = undefined;
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Secondary);
-  t.deepEqual(y, poolAllocation.Central);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
-
-test('swap Secondary for Central no give', t => {
-  const { run, bld } = setupMintKits();
-
-  const amountGiven = undefined;
-  const poolAllocation = {
-    Central: run(102902920n),
-    Secondary: bld(203838393n),
-  };
-  const amountWanted = run(9342193n);
-  const { x, y, deltaX, deltaY } = getXY({
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-  });
-
-  t.deepEqual(x, poolAllocation.Secondary);
-  t.deepEqual(y, poolAllocation.Central);
-  t.deepEqual(deltaX, amountGiven);
-  t.deepEqual(deltaY, amountWanted);
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js b/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js
deleted file mode 100644
index 22b1f5abfb6..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-readmeScenario.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { makeRatio } from '@agoric/zoe/src/contractSupport/index.js';
-import {
-  calcDeltaXSellingX,
-  calcDeltaYSellingX,
-  swapInNoFees,
-} from '../../../src/vpool-xyk-amm/constantProduct/core.js';
-import { pricesForStatedInput } from '../../../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js';
-
-const BASIS_POINTS = 10000n;
-
-// Moola is central
-
-const setupMints = () => {
-  const moolaKit = makeIssuerKit('moola');
-  const bucksKit = makeIssuerKit('bucks');
-  const simoleanKit = makeIssuerKit('simolean');
-
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const bucks = value => AmountMath.make(bucksKit.brand, value);
-  const simoleans = value => AmountMath.make(simoleanKit.brand, value);
-
-  return {
-    moolaKit,
-    bucksKit,
-    simoleanKit,
-    moola,
-    bucks,
-    simoleans,
-  };
-};
-
-// This test shows an example from README.md
-test('pricesForStatedInput  README example', async t => {
-  const { moola, bucks, moolaKit, bucksKit } = setupMints();
-  const poolAllocation = {
-    Central: moola(40_000_000n),
-    Secondary: bucks(3_000_000n),
-  };
-  const amountGiven = moola(30_000n);
-  const amountWanted = bucks(2_000n);
-
-  const protocolFeeRatio = makeRatio(5n, moolaKit.brand, BASIS_POINTS);
-  const poolFeeRatio = makeRatio(25n, bucksKit.brand, BASIS_POINTS);
-
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const noFeesResult = swapInNoFees({ amountGiven, poolAllocation });
-  t.deepEqual(noFeesResult.amountIn, moola(29996n));
-  t.deepEqual(noFeesResult.amountOut, bucks(2248n));
-
-  const noReductionResult = calcDeltaYSellingX(
-    poolAllocation.Central,
-    poolAllocation.Secondary,
-    amountGiven,
-  );
-  t.deepEqual(noReductionResult, bucks(2248n));
-
-  const reduced = calcDeltaXSellingX(
-    poolAllocation.Central,
-    poolAllocation.Secondary,
-    noReductionResult,
-  );
-  t.deepEqual(reduced, moola(29996n));
-
-  const result = pricesForStatedInput(
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  );
-  t.deepEqual(result.swapperGives, moola(29998n));
-  t.deepEqual(result.swapperGets, bucks(2241n));
-  t.deepEqual(result.protocolFee, moola(15n));
-  t.deepEqual(result.poolFee, bucks(6n));
-});
diff --git a/packages/inter-protocol/test/amm/constantProduct/test-swapScenarios.js b/packages/inter-protocol/test/amm/constantProduct/test-swapScenarios.js
deleted file mode 100644
index c97df636def..00000000000
--- a/packages/inter-protocol/test/amm/constantProduct/test-swapScenarios.js
+++ /dev/null
@@ -1,177 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-import {
-  makeRatio,
-  natSafeMath,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import {
-  BASIS_POINTS,
-  DEFAULT_PROTOCOL_FEE,
-  DEFAULT_POOL_FEE,
-} from '../../../src/vpool-xyk-amm/constantProduct/defaults.js';
-import { setupMintKits } from './setupMints.js';
-import { pricesForStatedInput } from '../../../src/vpool-xyk-amm/constantProduct/calcSwapPrices.js';
-
-const { multiply, ceilDivide } = natSafeMath;
-
-// This assumes run is swapped in. The test should function the same
-// regardless of what brand is the amountIn, because no run fee is
-// charged.
-const prepareSwapInTest = ({
-  inputPool,
-  outputPool,
-  inputValue,
-  outputValue,
-}) => {
-  const { run, bld, runKit, bldKit } = setupMintKits();
-  const amountGiven = run(inputValue);
-  const poolAllocation = harden({
-    Central: run(inputPool),
-    Secondary: bld(outputPool),
-  });
-  const amountWanted = bld(outputValue);
-  const protocolFeeRatio = makeRatio(
-    DEFAULT_PROTOCOL_FEE,
-    runKit.brand,
-    BASIS_POINTS,
-  );
-  const poolFeeRatio = makeRatio(DEFAULT_POOL_FEE, bldKit.brand, BASIS_POINTS);
-
-  const args = [
-    amountGiven,
-    poolAllocation,
-    amountWanted,
-    protocolFeeRatio,
-    poolFeeRatio,
-  ];
-
-  return { args, bld, run };
-};
-
-const testGetPrice = (t, inputs, expectedOutput) => {
-  const { args, run, bld } = prepareSwapInTest(inputs);
-  // @ts-expect-error typescript doesn't like param list built by destructuring
-  const result = pricesForStatedInput(...args);
-  const expected = harden({
-    protocolFee: run(expectedOutput.protocolFee),
-    poolFee: bld(expectedOutput.poolFee),
-    swapperGives: run(expectedOutput.swapperGives),
-    swapperGets: bld(expectedOutput.swapperGets),
-    xIncrement: run(expectedOutput.xIncrement),
-    yDecrement: bld(expectedOutput.yDecrement),
-    newX: run(expectedOutput.newX),
-    newY: bld(expectedOutput.newY),
-  });
-  t.deepEqual(result, expected);
-};
-
-// This uses the values that provoked a bug in newSwap.
-test('getInputPrice newSwap bug scenario', t => {
-  const input = {
-    inputPool: 50825056949339n,
-    outputPool: 2196247730468n,
-    inputValue: 73000000n,
-    outputValue: 100n,
-  };
-
-  const firstDeltaY =
-    (input.outputPool * input.inputValue) /
-    (input.inputPool + input.inputValue);
-  const firstImprovedDeltaX =
-    (input.inputPool * firstDeltaY) / (input.outputPool - firstDeltaY);
-  const poolFee = ceilDivide(
-    multiply(DEFAULT_POOL_FEE, firstDeltaY),
-    BASIS_POINTS,
-  );
-  const protocolFee = ceilDivide(
-    multiply(DEFAULT_PROTOCOL_FEE, firstImprovedDeltaX),
-    BASIS_POINTS,
-  );
-
-  const secondDeltaY =
-    (input.outputPool * (input.inputValue - protocolFee)) /
-    (input.inputPool + (input.inputValue - protocolFee));
-  const secondImprovedDeltaX =
-    (input.inputPool * secondDeltaY) / (input.outputPool - secondDeltaY);
-  const yDecrement = secondDeltaY - poolFee;
-  const improvement = 3n;
-  const xIncrement = input.inputValue - protocolFee - improvement;
-  t.is(secondImprovedDeltaX + 1n, xIncrement);
-  const expectedOutput = harden({
-    poolFee,
-    protocolFee,
-    swapperGives: input.inputValue - improvement,
-    swapperGets: yDecrement,
-    xIncrement,
-    yDecrement,
-    newX: input.inputPool + xIncrement,
-    newY: input.outputPool - yDecrement,
-  });
-  testGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice xy=k example', t => {
-  const input = {
-    inputPool: 40000n,
-    outputPool: 3000n,
-    inputValue: 300n,
-    outputValue: 20n,
-  };
-
-  const poolFee = 1n;
-  const protocolFee = 1n;
-
-  const secondDeltaY =
-    (input.outputPool * (input.inputValue - protocolFee)) /
-    (input.inputPool + (input.inputValue - protocolFee));
-  const secondImprovedDeltaX =
-    (input.inputPool * secondDeltaY) / (input.outputPool - secondDeltaY);
-  const yDecrement = secondDeltaY - poolFee;
-  const improvement = 3n;
-  const xIncrement = input.inputValue - protocolFee - improvement;
-  t.is(secondImprovedDeltaX + 1n, xIncrement);
-  const expectedOutput = harden({
-    poolFee,
-    protocolFee,
-    swapperGives: input.inputValue - improvement,
-    swapperGets: yDecrement,
-    xIncrement,
-    yDecrement,
-    newX: input.inputPool + xIncrement,
-    newY: input.outputPool - yDecrement,
-  });
-  testGetPrice(t, input, expectedOutput);
-});
-
-test('getInputPrice xy=k bigger numbers', t => {
-  const input = {
-    inputPool: 40000000n,
-    outputPool: 3000000n,
-    inputValue: 30000n,
-    outputValue: 2000n,
-  };
-
-  const poolFee = 6n;
-  const protocolFee = 18n;
-
-  const secondDeltaY =
-    (input.outputPool * (input.inputValue - protocolFee)) /
-    (input.inputPool + (input.inputValue - protocolFee));
-  const secondImprovedDeltaX =
-    (input.inputPool * secondDeltaY) / (input.outputPool - secondDeltaY) + 1n;
-  const yDecrement = secondDeltaY - poolFee;
-  const improvement = 12n;
-  const xIncrement = input.inputValue - protocolFee - improvement;
-  t.is(secondImprovedDeltaX, xIncrement);
-  const expectedOutput = harden({
-    poolFee,
-    protocolFee,
-    swapperGives: input.inputValue - improvement,
-    swapperGets: yDecrement,
-    xIncrement,
-    yDecrement,
-    newX: input.inputPool + xIncrement,
-    newY: input.outputPool - yDecrement,
-  });
-  testGetPrice(t, input, expectedOutput);
-});
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/setup.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/setup.js
deleted file mode 100644
index 546c600898c..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/setup.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import { makeLoopback } from '@endo/captp';
-import { E } from '@endo/eventual-send';
-
-import { allValues, makeTracer } from '@agoric/internal';
-import {
-  makeAgoricNamesAccess,
-  makePromiseSpace,
-} from '@agoric/vats/src/core/utils.js';
-import { makeBoard } from '@agoric/vats/src/lib-board.js';
-import { Stable } from '@agoric/vats/src/tokens.js';
-import { makeZoeKit } from '@agoric/zoe';
-import { makeFakeVatAdmin } from '@agoric/zoe/tools/fakeVatAdmin.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
-
-import {
-  setupAmm,
-  setupReserve,
-} from '../../../src/proposals/econ-behaviors.js';
-import { startEconomicCommittee } from '../../../src/proposals/startEconCommittee.js';
-import {
-  installPuppetGovernance,
-  makeMockChainStorageRoot,
-  provideBundle,
-} from '../../supports.js';
-
-const ammRoot = './src/vpool-xyk-amm/multipoolMarketMaker.js'; // package relative
-const reserveRoot = './src/reserve/assetReserve.js'; // package relative
-
-const trace = makeTracer('AmmTS', false);
-
-export const setUpZoeForTest = async () => {
-  const { makeFar } = makeLoopback('zoeTest');
-
-  const { zoeService, feeMintAccess } = await makeFar(
-    makeZoeKit(makeFakeVatAdmin(() => {}).admin, undefined, {
-      name: Stable.symbol,
-      assetKind: Stable.assetKind,
-      displayInfo: Stable.displayInfo,
-    }),
-  );
-
-  return {
-    zoe: zoeService,
-    feeMintAccessP: feeMintAccess,
-  };
-};
-harden(setUpZoeForTest);
-/** @typedef {Awaited<ReturnType<typeof setUpZoeForTest>>} FarZoeKit */
-
-/**
- *
- * @param {import('@agoric/time/src/types').TimerService} timer
- * @param {ERef<FarZoeKit>} [farZoeKit]
- */
-export const setupAMMBootstrap = async (
-  timer = buildManualTimer(console.log),
-  farZoeKit,
-) => {
-  if (!farZoeKit) {
-    farZoeKit = setUpZoeForTest();
-  }
-  trace('setupAMMBootstrap');
-  const { zoe } = await farZoeKit;
-
-  const space = /** @type {any} */ (makePromiseSpace());
-  const { produce, consume } =
-    /** @type { import('../../../src/proposals/econ-behaviors.js').EconomyBootstrapPowers } */ (
-      space
-    );
-
-  produce.chainTimerService.resolve(timer);
-  produce.zoe.resolve(zoe);
-
-  const { agoricNames, agoricNamesAdmin, spaces } = makeAgoricNamesAccess();
-  produce.agoricNames.resolve(agoricNames);
-  produce.agoricNamesAdmin.resolve(agoricNamesAdmin);
-
-  installPuppetGovernance(zoe, spaces.installation.produce);
-  produce.chainStorage.resolve(makeMockChainStorageRoot());
-  produce.board.resolve(makeBoard());
-
-  return { produce, consume, ...spaces };
-};
-
-/**
- * NOTE: called separately by each test so AMM/zoe/priceAuthority don't interfere
- *
- * @param {*} t
- * @param {{ committeeName: string, committeeSize: number}} electorateTerms
- * @param {{ brand: Brand, issuer: Issuer }} centralR
- * @param {ManualTimer} [timer]
- * @param {ERef<FarZoeKit>} [farZoeKit]
- */
-export const setupAmmServices = async (
-  t,
-  electorateTerms = { committeeName: 'The Cabal', committeeSize: 1 },
-  centralR,
-  timer = buildManualTimer(t.log),
-  farZoeKit,
-) => {
-  trace('setupAmmServices', { farZoeKit });
-  if (!farZoeKit) {
-    farZoeKit = await setUpZoeForTest();
-  }
-  const { feeMintAccessP, zoe } = await farZoeKit;
-  const feeMintAccess = await feeMintAccessP;
-  trace('setupAMMBootstrap');
-  const space = await setupAMMBootstrap(timer, farZoeKit);
-  space.produce.zoe.resolve(zoe);
-  space.produce.feeMintAccess.resolve(feeMintAccess);
-  const { consume, brand, issuer, installation, instance } = space;
-  const ammBundle = await provideBundle(t, ammRoot, 'amm');
-  installation.produce.amm.resolve(E(zoe).install(ammBundle));
-  const reserveBundle = await provideBundle(t, reserveRoot, 'reserve');
-  installation.produce.reserve.resolve(E(zoe).install(reserveBundle));
-
-  brand.produce.IST.resolve(centralR.brand);
-  issuer.produce.IST.resolve(centralR.issuer);
-
-  await Promise.all([
-    startEconomicCommittee(space, {
-      options: { econCommitteeOptions: electorateTerms },
-    }),
-    setupAmm(space, {
-      options: {
-        minInitialPoolLiquidity: 1000n,
-      },
-    }),
-  ]);
-  await setupReserve(space);
-
-  const installs = await allValues({
-    amm: installation.consume.amm,
-    governor: installation.consume.contractGovernor,
-    electorate: installation.consume.committee,
-    counter: installation.consume.binaryVoteCounter,
-  });
-
-  /** @type {Promise<import('@agoric/governance/tools/puppetContractGovernor.js').PuppetContractGovernorKit<import('../../../src/vpool-xyk-amm/multipoolMarketMaker.js').start>['creatorFacet']>} */
-  // @ts-expect-error cast for testing env
-  const governorCreatorFacet = E.get(consume.ammKit).governorCreatorFacet;
-  const governorInstance = await instance.consume.ammGovernor;
-  const governorPublicFacet = await E(zoe).getPublicFacet(governorInstance);
-  const g = {
-    governorInstance,
-    governorPublicFacet,
-    governorCreatorFacet,
-  };
-  const governedInstance = E(governorPublicFacet).getGovernedContract();
-
-  const ammPublicFacet = await E(governorCreatorFacet).getPublicFacet();
-  const amm = {
-    ammCreatorFacet: await E.get(consume.ammKit).creatorFacet,
-    ammPublicFacet,
-    instance: governedInstance,
-  };
-
-  const committeeCreator = await consume.economicCommitteeCreatorFacet;
-  const electorateInstance = await instance.consume.economicCommittee;
-
-  const poserInvitationP = E(committeeCreator).getPoserInvitation();
-  const poserInvitationAmount = await E(
-    E(zoe).getInvitationIssuer(),
-  ).getAmountOf(poserInvitationP);
-
-  /** @type {import('@agoric/internal/src/storage-test-utils.js').MockChainStorageRoot} */
-  // @ts-expect-error cast
-  const mockChainStorage = await space.consume.chainStorage;
-
-  return {
-    zoe,
-    installs,
-    electorate: installs.electorate,
-    committeeCreator,
-    electorateInstance,
-    governor: g,
-    amm,
-    invitationAmount: poserInvitationAmount,
-    mockChainStorage,
-    space,
-  };
-};
-harden(setupAmmServices);
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js
deleted file mode 100644
index c76e0636823..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-addLiquidity.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { balancesToReachRatio } from '../../../src/vpool-xyk-amm/addLiquidity.js';
-import { setupMintKits } from '../constantProduct/setupMints.js';
-
-test.before(async t => {
-  const bundleCache = await unsafeMakeBundleCache('bundles/');
-  t.context = { bundleCache };
-});
-
-// The pool starts at 3000 and 4000. We want to add 400K and 300K to the pool,
-// so the ratio will be close to 4:3
-test('calcBalances', t => {
-  const { run, bld } = setupMintKits();
-  t.deepEqual(
-    balancesToReachRatio(run(3000n), bld(4000n), run(400_000n), bld(300_000n)),
-    {
-      targetX: run(3988n),
-      targetY: bld(3008n),
-    },
-  );
-});
-
-// pool starts at 4 and 9. We want it to end with a ratio of 12 to 3. This
-// calculation doesn't pay attention to fees.
-test('calcBalances 2', t => {
-  const { run, bld } = setupMintKits();
-  t.deepEqual(balancesToReachRatio(run(4n), bld(9n), run(1196n), bld(291n)), {
-    targetX: run(12n),
-    targetY: bld(3n),
-  });
-});
-
-// The pool has x=4, y=9. The user wants to change the ratio to 1.1M:20K. The
-// pool balance doesn't have enough resolution to support that, so it says no.
-test('calcBalances out of balance', t => {
-  const { run, bld } = setupMintKits();
-  t.deepEqual(
-    balancesToReachRatio(run(4n), bld(9n), run(1_196_000n), bld(21_000n)),
-    {
-      targetX: run(0n),
-      targetY: bld(0n),
-    },
-  );
-});
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-calc.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-calc.js
deleted file mode 100644
index 90c1e12f8cc..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-calc.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { AmountMath as m, makeIssuerKit } from '@agoric/ertp';
-import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
-import { fc } from '@fast-check/ava';
-import {
-  imbalancedRequest,
-  balancesToReachRatio,
-} from '../../../src/vpool-xyk-amm/addLiquidity.js';
-
-const { add, multiply } = natSafeMath;
-
-const { brand: brandX } = makeIssuerKit('X');
-const { brand: brandY } = makeIssuerKit('Y');
-
-const oneB = 1_000_000_000n;
-const dec18 = 1_000_000_000_000_000_000n; // 18 decimals as used in ETH
-
-// The starting balances in the pools will be between 10^4 and  10^27
-const arbPoolX = fc
-  .bigUint({ max: oneB * dec18 })
-  .map(value => m.make(brandX, 10_000n + value));
-const arbPoolY = fc
-  .bigUint({ max: oneB * dec18 })
-  .map(value => m.make(brandY, 10_000n + value));
-
-// The amounts to be deposited will be less than 10^27
-const arbGiveX = fc
-  .bigUint({ max: oneB * dec18 })
-  .map(value => m.make(brandX, value));
-const arbGiveY = fc
-  .bigUint({ max: oneB * dec18 })
-  .map(value => m.make(brandY, value));
-
-// left and right are within 5% of each other.
-const withinEpsilon = (left, right) =>
-  multiply(right, 105) >= multiply(left, 100) &&
-  multiply(left, 105) >= multiply(right, 100);
-
-test('balancesToReachRatio calculations are to spec', async t => {
-  await fc.assert(
-    fc.property(
-      fc.record({
-        poolX: arbPoolX,
-        poolY: arbPoolY,
-        giveX: arbGiveX,
-        giveY: arbGiveY,
-      }),
-      ({ poolX, poolY, giveX, giveY }) => {
-        // skip cases where the target ratio is more than K at the start
-        fc.pre(
-          !imbalancedRequest(
-            // use floats so we don't convert all fractions less than 1 to 0.
-            Number(m.add(poolX, giveX).value) /
-              Number(m.add(poolY, giveY).value),
-            multiply(poolX.value, poolY.value),
-          ),
-        );
-        let ok = true;
-
-        const { targetX, targetY } = balancesToReachRatio(
-          poolX,
-          poolY,
-          giveX,
-          giveY,
-        );
-
-        const targetWithinRangeOfK = withinEpsilon(
-          multiply(targetX.value, targetY.value),
-          multiply(poolX.value, poolY.value),
-        );
-        t.truthy(
-          targetWithinRangeOfK,
-          `with giveX=${giveX.value} giveY=${giveY.value}, targetX=${targetX.value} and targetY=${targetY.value} should have the same product as poolX=${poolX.value} * poolY=${poolY.value}.`,
-        );
-        if (!targetWithinRangeOfK) ok = false;
-
-        // target X / targetY approximately equals poolXAfter / poolYAfter
-        const ratiosWithinRange = withinEpsilon(
-          targetX.value * add(poolY.value, giveY.value),
-          targetY.value * add(poolX.value, giveX.value),
-        );
-        t.truthy(
-          ratiosWithinRange,
-          `targetX ${targetX.value} and targetY ${targetY.value} should be in the same ratio as poolX + giveX / poolY + giveY`,
-        );
-        if (!ratiosWithinRange) ok = false;
-
-        return ok;
-      },
-    ),
-  );
-});
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js
deleted file mode 100644
index d6739e8f023..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-amm-governance.js
+++ /dev/null
@@ -1,188 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { CONTRACT_ELECTORATE } from '@agoric/governance';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
-import { eventLoopIteration } from '@agoric/zoe/tools/eventLoopIteration.js';
-import { E } from '@endo/eventual-send';
-import { startEconomicCommittee } from '../../../src/proposals/startEconCommittee.js';
-import { amountGT } from '../../../src/vpool-xyk-amm/constantProduct/calcFees.js';
-import {
-  MIN_INITIAL_POOL_LIQUIDITY_KEY,
-  POOL_FEE_KEY,
-  PROTOCOL_FEE_KEY,
-} from '../../../src/vpool-xyk-amm/params.js';
-import { setupAMMBootstrap, setupAmmServices } from './setup.js';
-
-test.before(async t => {
-  const bundleCache = await unsafeMakeBundleCache('bundles/');
-  t.context = { bundleCache };
-});
-
-test('start Economic Committee', async t => {
-  const space = await setupAMMBootstrap();
-  const { consume } = space;
-  await startEconomicCommittee(space, {
-    options: {
-      econCommitteeOptions: {
-        committeeName: 'The Cabal',
-        committeeSize: 1,
-      },
-    },
-  });
-  const agoricNames = await consume.agoricNames;
-  const instance = await E(agoricNames).lookup('instance', 'economicCommittee');
-  t.truthy(instance);
-  const creator = await consume.economicCommitteeCreatorFacet;
-  t.truthy(creator);
-});
-
-test('amm change param via Governance', async t => {
-  const centralR = makeIssuerKit('central');
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  const timer = buildManualTimer(t.log, 0n, { eventLoopIteration });
-
-  const { amm, governor, invitationAmount } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getGovernedParams(),
-    {
-      [POOL_FEE_KEY]: {
-        type: 'nat',
-        value: 24n,
-      },
-      [MIN_INITIAL_POOL_LIQUIDITY_KEY]: {
-        type: 'amount',
-        value: AmountMath.make(centralR.brand, 1000n),
-      },
-      [PROTOCOL_FEE_KEY]: {
-        type: 'nat',
-        value: 6n,
-      },
-      [CONTRACT_ELECTORATE]: {
-        type: 'invitation',
-        value: invitationAmount,
-      },
-    },
-    'initial values',
-  );
-
-  const { governorCreatorFacet } = governor;
-  const paramChangeSpec = harden({
-    paramPath: { key: 'governedParams' },
-    changes: { [PROTOCOL_FEE_KEY]: 20n },
-  });
-
-  await E(governorCreatorFacet).changeParams(paramChangeSpec);
-
-  const protocolFee = await E(amm.ammPublicFacet).getProtocolFee();
-  t.deepEqual(protocolFee, 20n, 'updated value');
-});
-
-test('price check after Governance param change', async t => {
-  const centralR = makeIssuerKit('central');
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  const timer = buildManualTimer(t.log, 0n, { eventLoopIteration });
-
-  const { zoe, amm, governor, invitationAmount } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  // Setup Alice
-  const aliceMoolaPayment = moolaKit.mint.mintPayment(moola(100000n));
-  // Let's assume that central tokens are worth 2x as much as moola
-  const aliceCentralPayment = centralR.mint.mintPayment(centralTokens(50000n));
-
-  const moolaLiquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const aliceAddLiquidityInvitation = E(amm.ammPublicFacet).addPoolInvitation();
-
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-  const moolaLiquidity = value => AmountMath.make(moolaLiquidityBrand, value);
-
-  const aliceProposal = harden({
-    want: { Liquidity: moolaLiquidity(40000n) },
-    give: { Secondary: moola(100000n), Central: centralTokens(50000n) },
-  });
-  const alicePayments = {
-    Secondary: aliceMoolaPayment,
-    Central: aliceCentralPayment,
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    aliceAddLiquidityInvitation,
-    aliceProposal,
-    alicePayments,
-  );
-
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Alice added moola and central liquidity`,
-  );
-
-  // look up the price of 17000 moola in central tokens
-  const priceInCentrals = await E(amm.ammPublicFacet).getInputPrice(
-    moola(17000n),
-    AmountMath.makeEmpty(centralR.brand),
-  );
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getGovernedParams(),
-    {
-      PoolFee: {
-        type: 'nat',
-        value: 24n,
-      },
-      ProtocolFee: {
-        type: 'nat',
-        value: 6n,
-      },
-      MinInitialPoolLiquidity: {
-        type: 'amount',
-        value: AmountMath.make(centralR.brand, 1000n),
-      },
-      Electorate: {
-        type: 'invitation',
-        value: invitationAmount,
-      },
-    },
-    'initial values',
-  );
-
-  const { governorCreatorFacet } = governor;
-  const paramChangeSpec = harden({
-    paramPath: { key: 'governedParams' },
-    changes: {
-      [PROTOCOL_FEE_KEY]: 20n,
-    },
-  });
-  await E(governorCreatorFacet).changeParams(paramChangeSpec);
-
-  const paramValue = await E(amm.ammPublicFacet).getNat(PROTOCOL_FEE_KEY);
-  t.deepEqual(paramValue, 20n, 'updated value');
-
-  const priceAfter = await E(amm.ammPublicFacet).getInputPrice(
-    moola(17000n),
-    AmountMath.makeEmpty(centralR.brand),
-  );
-
-  t.truthy(amountGT(priceInCentrals.amountOut, priceAfter.amountOut));
-  t.truthy(AmountMath.isEqual(priceAfter.amountIn, priceInCentrals.amountIn));
-});
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js
deleted file mode 100644
index 68592674ec2..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-liquidity.js
+++ /dev/null
@@ -1,712 +0,0 @@
-import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { setup } from '@agoric/zoe/test/unitTests/setupBasicMints.js';
-import { assertPayoutAmount } from '@agoric/zoe/test/zoeTestHelpers.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
-import { E } from '@endo/eventual-send';
-import { subscriptionTracker } from '../../metrics.js';
-import { setupAmmServices } from './setup.js';
-
-/** @typedef {Record<string, any> & {
- *   bundleCache: Awaited<ReturnType<typeof unsafeMakeBundleCache>>,
- * }} Context */
-/** @type {import('ava').TestFn<Context>} */
-const test = unknownTest;
-
-test.before(async t => {
-  const bundleCache = await unsafeMakeBundleCache('bundles/');
-  t.context = { bundleCache };
-});
-
-const makeLiquidityInvitations = async (
-  t,
-  zoe,
-  amm,
-  moolaKit,
-  centralR,
-  moolaLiquidityIssuer,
-) => {
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const makeMoola = value => AmountMath.make(moolaKit.brand, value);
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-  const moolaLiquidity = value => AmountMath.make(moolaLiquidityBrand, value);
-
-  const addLiquidity = async (moola, central) => {
-    const addLiquidityInvitation = E(
-      amm.ammPublicFacet,
-    ).makeAddLiquidityInvitation();
-
-    const aliceMoolaPayment1 = moolaKit.mint.mintPayment(makeMoola(moola));
-    const aliceCentralPayment1 = centralR.mint.mintPayment(
-      centralTokens(central),
-    );
-
-    const aliceProposal = harden({
-      want: { Liquidity: moolaLiquidity(1000n) },
-      give: { Secondary: makeMoola(moola), Central: centralTokens(central) },
-    });
-    const alicePayments = {
-      Secondary: aliceMoolaPayment1,
-      Central: aliceCentralPayment1,
-    };
-
-    const addLiquiditySeat = await E(zoe).offer(
-      addLiquidityInvitation,
-      aliceProposal,
-      alicePayments,
-    );
-
-    t.is(
-      await E(addLiquiditySeat).getOfferResult(),
-      'Added liquidity.',
-      `Alice added moola and central liquidity`,
-    );
-
-    return E(addLiquiditySeat).getPayouts();
-  };
-
-  const removeLiquidity = async (liquidityTokens, liquidity) => {
-    const removeLiquidityInvitation = E(
-      amm.ammPublicFacet,
-    ).makeRemoveLiquidityInvitation();
-
-    const emptyLiquidity = moolaLiquidity(liquidity);
-    const aliceProposal = harden({
-      give: { Liquidity: emptyLiquidity },
-      want: {
-        Secondary: makeMoola(0n),
-        Central: centralTokens(0n),
-      },
-    });
-    const alicePayments = { Liquidity: liquidityTokens };
-
-    const removeLiquiditySeat = await E(zoe).offer(
-      removeLiquidityInvitation,
-      aliceProposal,
-      alicePayments,
-    );
-
-    t.is(
-      await E(removeLiquiditySeat).getOfferResult(),
-      'Liquidity successfully removed.',
-      `Alice removed liquidity`,
-    );
-
-    return E(removeLiquiditySeat).getPayouts();
-  };
-  return { addLiquidity, removeLiquidity };
-};
-
-const makeAssertPayouts = (
-  t,
-  moolaLiquidityIssuer,
-  liquidityBrand,
-  centralR,
-  moolaKit,
-) => {
-  return async (
-    lPayment,
-    lExpected,
-    cPayment,
-    cExpected,
-    sPayment,
-    sExpected,
-  ) => {
-    const lAmount = AmountMath.make(liquidityBrand, lExpected);
-    await assertPayoutAmount(
-      t,
-      moolaLiquidityIssuer,
-      lPayment,
-      lAmount,
-      'Liquidity payout',
-    );
-    const cAmount = AmountMath.make(centralR.brand, cExpected);
-    await assertPayoutAmount(
-      t,
-      centralR.issuer,
-      cPayment,
-      cAmount,
-      'central payout',
-    );
-    const sAmount = AmountMath.make(moolaKit.brand, sExpected);
-    await assertPayoutAmount(
-      t,
-      moolaKit.issuer,
-      sPayment,
-      sAmount,
-      'moola Payout',
-    );
-  };
-};
-
-test('amm add issuers in parallel', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaR = makeIssuerKit('moola');
-
-  const { amm } = await setupAmmServices(
-    t,
-    { committeeName: 'EnBancPanel', committeeSize: 3 },
-    centralR,
-  );
-
-  const [issuer1, issuer2, issuer3] = await Promise.all([
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola1'),
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola2'),
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola3'),
-  ]);
-
-  t.is(issuer1, issuer2);
-  t.is(issuer1, issuer3);
-
-  const issuer4 = await E(amm.ammPublicFacet).addIssuer(
-    moolaR.issuer,
-    'Moola4',
-  );
-  t.is(issuer1, issuer4);
-});
-
-test('amm add issuer in parallel same keyword', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaR = makeIssuerKit('moola');
-
-  const { amm } = await setupAmmServices(
-    t,
-    { committeeName: 'EnBancPanel', committeeSize: 3 },
-    centralR,
-  );
-
-  const [issuer1, issuer2, issuer3] = await Promise.all([
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola'),
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola'),
-    E(amm.ammPublicFacet).addIssuer(moolaR.issuer, 'Moola'),
-  ]);
-
-  t.is(issuer1, issuer2);
-  t.is(issuer1, issuer3);
-});
-
-test('amm add and remove liquidity', async t => {
-  const centralLiquidityValue = 1_500_000_000n;
-  const secondaryLiquidityValue = 300_000_000n;
-
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const central = value => AmountMath.make(centralR.brand, value);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    { committeeName: 'EnBancPanel', committeeSize: 3 },
-    centralR,
-  );
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const proposal = harden({
-    give: {
-      Secondary: moola(secondaryLiquidityValue),
-      Central: central(centralLiquidityValue),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: moolaKit.mint.mintPayment(moola(secondaryLiquidityValue)),
-    Central: centralR.mint.mintPayment(central(centralLiquidityValue)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    proposal,
-    payments,
-  );
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Added Moola and Central Liquidity`,
-  );
-
-  const poolMetrics = await E(amm.ammPublicFacet).getPoolMetrics(
-    moolaKit.brand,
-  );
-  const tracker = await subscriptionTracker(t, poolMetrics);
-  await tracker.assertInitial({
-    centralAmount: central(0n),
-    liquidityTokens: AmountMath.makeEmpty(liquidityBrand),
-    secondaryAmount: moola(0n),
-  });
-
-  const poolLiquidity = {
-    centralAmount: { value: 1500000000n },
-    liquidityTokens: { value: 1500000000n },
-    secondaryAmount: { value: 300000000n },
-  };
-  await tracker.assertChange(poolLiquidity);
-
-  const alloc = await E(addLiquiditySeat).getFinalAllocation();
-  t.deepEqual(alloc, {
-    Central: central(0n),
-    Liquidity: AmountMath.make(liquidityBrand, 1_499_999_000n),
-    Secondary: moola(0n),
-  });
-
-  const allocation = (c, l, s) => ({
-    Central: AmountMath.make(centralR.brand, c),
-    Liquidity: AmountMath.make(liquidityBrand, l),
-    Secondary: moola(s),
-  });
-  const { addLiquidity, removeLiquidity } = await makeLiquidityInvitations(
-    t,
-    zoe,
-    amm,
-    moolaKit,
-    centralR,
-    liquidityIssuer,
-  );
-  const assertPayouts = makeAssertPayouts(
-    t,
-    liquidityIssuer,
-    liquidityBrand,
-    centralR,
-    moolaKit,
-  );
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    {
-      Central: central(centralLiquidityValue),
-      Liquidity: AmountMath.makeEmpty(liquidityBrand),
-      Secondary: moola(secondaryLiquidityValue),
-    },
-    `The pool will hava an initial Allocation`,
-  );
-
-  // add liquidity at 10_000:50_000
-  const {
-    Central: c1,
-    Liquidity: l1,
-    Secondary: s1,
-  } = await addLiquidity(10000n, 50_000n);
-  // We get liquidity back. All the central and secondary is accepted
-  await assertPayouts(l1, 50_000n, c1, 0n, s1, 0n);
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(
-      centralLiquidityValue + 50_000n,
-      0n,
-      secondaryLiquidityValue + 10000n,
-    ),
-    `poolAllocation after initialization`,
-  );
-
-  poolLiquidity.centralAmount.value += 50000n;
-  poolLiquidity.liquidityTokens.value += 50000n;
-  poolLiquidity.secondaryAmount.value += 10000n;
-  await tracker.assertChange(poolLiquidity);
-
-  // Add liquidity. Offer 20_000:70_000. It will be accepted at a ratio of 5:1
-  const {
-    Central: c2,
-    Liquidity: l2,
-    Secondary: s2,
-  } = await addLiquidity(20_000n, 70_000n);
-  // After the trade, this will increase the pool by about 140%
-  await assertPayouts(l2, 70_000n, c2, 0n, s2, 6000n);
-  // The pool should now have grown by 50K + 70K and 24K
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(
-      centralLiquidityValue + 120_000n,
-      0n,
-      secondaryLiquidityValue + 24_000n,
-    ),
-    `poolAllocation after adding more`,
-  );
-
-  poolLiquidity.centralAmount.value += 70000n;
-  poolLiquidity.liquidityTokens.value += 70000n;
-  poolLiquidity.secondaryAmount.value += 14000n;
-  await tracker.assertChange(poolLiquidity);
-
-  const [l40Payment, _l30Payment] = await E(liquidityIssuer).split(
-    l2,
-    AmountMath.make(liquidityBrand, 40_000n),
-  );
-
-  // remove liquidity. 40K is 1/3 of liquidity. Should get 1/3 of Moola and RUN.
-  const {
-    Central: c3,
-    Liquidity: l3,
-    Secondary: s3,
-  } = await removeLiquidity(l40Payment, 40_000n);
-  await assertPayouts(l3, 0n, c3, 40_000n, s3, 8000n);
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(
-      centralLiquidityValue + 80_000n,
-      40_000n,
-      secondaryLiquidityValue + 16_000n,
-    ),
-    `poolAllocation after removing liquidity`,
-  );
-
-  poolLiquidity.centralAmount.value -= 40000n;
-  poolLiquidity.liquidityTokens.value -= 40000n;
-  poolLiquidity.secondaryAmount.value -= 8000n;
-  await tracker.assertChange(poolLiquidity);
-});
-
-test('MinInitialPoolLiquidity to reserve', async t => {
-  const centralLiquidityValue = 1_500_000_000n;
-  const secondaryLiquidityValue = 300_000_000n;
-
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const central = value => AmountMath.make(centralR.brand, value);
-
-  const { zoe, amm, space } = await setupAmmServices(
-    t,
-    { committeeName: 'EnBancPanel', committeeSize: 3 },
-    centralR,
-  );
-  const { reserveKit } = space.consume;
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const proposal = harden({
-    give: {
-      Secondary: moola(secondaryLiquidityValue),
-      Central: central(centralLiquidityValue),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: moolaKit.mint.mintPayment(moola(secondaryLiquidityValue)),
-    Central: centralR.mint.mintPayment(central(centralLiquidityValue)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    proposal,
-    payments,
-  );
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Added Moola and Central Liquidity`,
-  );
-
-  const reserveCreatorFacet = E.get(reserveKit).creatorFacet;
-  const reserveAllocations = await E(reserveCreatorFacet).getAllocations();
-  t.deepEqual(reserveAllocations, {
-    RmoolaLiquidity: AmountMath.make(liquidityBrand, 1000n),
-  });
-});
-
-/// /#5293.   AddLiquidity with wrong token in want increments liqTokenSupply and then breaks
-test('add wrong liquidity', async t => {
-  const centralLiquidityValue = 1_500_000_000n;
-  const secondaryLiquidityValue = 300_000_000n;
-
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const central = value => AmountMath.make(centralR.brand, value);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    { committeeName: 'EnBancPanel', committeeSize: 3 },
-    centralR,
-  );
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const proposal = harden({
-    give: {
-      Secondary: moola(secondaryLiquidityValue),
-      Central: central(centralLiquidityValue),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: moolaKit.mint.mintPayment(moola(secondaryLiquidityValue)),
-    Central: centralR.mint.mintPayment(central(centralLiquidityValue)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    proposal,
-    payments,
-  );
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Added Moola and Central Liquidity`,
-  );
-
-  const poolMetrics = await E(amm.ammPublicFacet).getPoolMetrics(
-    moolaKit.brand,
-  );
-  const tracker = await subscriptionTracker(t, poolMetrics);
-  await tracker.assertInitial({
-    centralAmount: central(0n),
-    liquidityTokens: AmountMath.makeEmpty(liquidityBrand),
-    secondaryAmount: moola(0n),
-  });
-
-  const poolLiquidity = {
-    centralAmount: { value: 1500000000n },
-    liquidityTokens: { value: 1500000000n },
-    secondaryAmount: { value: 300000000n },
-  };
-  await tracker.assertChange(poolLiquidity);
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    harden({
-      Central: central(poolLiquidity.centralAmount.value),
-      Liquidity: AmountMath.makeEmpty(liquidityBrand),
-      Secondary: moola(poolLiquidity.secondaryAmount.value),
-    }),
-  );
-
-  const alloc = await E(addLiquiditySeat).getFinalAllocation();
-  t.deepEqual(alloc, {
-    Central: central(0n),
-    Liquidity: AmountMath.make(liquidityBrand, 1_499_999_000n),
-    Secondary: moola(0n),
-  });
-
-  const m = moola(10000n);
-  const c = central(15000n);
-
-  // deliberately incorrect token in want. Should be moolaLiquidity
-  const aliceBrokenProposal = harden({
-    want: { Liquidity: moola(1000n) },
-    give: { Secondary: m, Central: c },
-  });
-  const alicePayments = {
-    Secondary: moolaKit.mint.mintPayment(m),
-    Central: centralR.mint.mintPayment(c),
-  };
-
-  const addLiquiditySeatBreaking = await E(zoe).offer(
-    E(amm.ammPublicFacet).makeAddLiquidityInvitation(),
-    aliceBrokenProposal,
-    alicePayments,
-  );
-
-  await t.throwsAsync(() => E(addLiquiditySeatBreaking).getOfferResult(), {
-    message: 'liquidity brand must be "[Alleged: MoolaLiquidity brand]"',
-  });
-
-  await E(addLiquiditySeatBreaking).getPayouts();
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    harden({
-      Central: central(poolLiquidity.centralAmount.value),
-      Liquidity: AmountMath.make(liquidityBrand, 0n),
-      Secondary: moola(poolLiquidity.secondaryAmount.value),
-    }),
-  );
-
-  // Add liquidity correctly, so we can see Liquidity token balance in tracker
-  const aliceProposal = harden({
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-    give: { Secondary: m, Central: c },
-  });
-  const aliceNewPayments = {
-    Secondary: moolaKit.mint.mintPayment(m),
-    Central: centralR.mint.mintPayment(c),
-  };
-  const addLiquiditySeatCorrect = await E(zoe).offer(
-    E(amm.ammPublicFacet).makeAddLiquidityInvitation(),
-    aliceProposal,
-    aliceNewPayments,
-  );
-
-  t.deepEqual(
-    await E(addLiquiditySeatCorrect).getOfferResult(),
-    'Added liquidity.',
-  );
-
-  await E(addLiquiditySeatCorrect).getPayouts();
-
-  const poolLiquidity2 = {
-    centralAmount: { value: 1500000000n + 15000n },
-    liquidityTokens: { value: 1500000000n + 15000n },
-    secondaryAmount: { value: 300000000n + 3000n },
-  };
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    harden({
-      Central: central(poolLiquidity2.centralAmount.value),
-      Liquidity: AmountMath.make(liquidityBrand, 0n),
-      Secondary: moola(poolLiquidity2.secondaryAmount.value),
-    }),
-  );
-  await tracker.assertChange(poolLiquidity2);
-});
-
-test('amm remove zero liquidity', async t => {
-  const centralLiquidityValue = 1_500_000_000n;
-  const secondaryLiquidityValue = 300_000_000n;
-
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaKit = makeIssuerKit('moola');
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const makeMoola = value => AmountMath.make(moolaKit.brand, value);
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const central = value => AmountMath.make(centralR.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(console.log, 30n);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const fundPoolProposal = harden({
-    give: {
-      Secondary: moola(secondaryLiquidityValue),
-      Central: central(centralLiquidityValue),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: moolaKit.mint.mintPayment(moola(secondaryLiquidityValue)),
-    Central: centralR.mint.mintPayment(central(centralLiquidityValue)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    fundPoolProposal,
-    payments,
-  );
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Added Moola and Central Liquidity`,
-  );
-
-  const emptyLiquidity = AmountMath.makeEmpty(liquidityBrand);
-  const liqPurse = E(liquidityIssuer).makeEmptyPurse();
-  const emptyPayment = await E(liqPurse).withdraw(emptyLiquidity);
-  const paymentRecord = {
-    Liquidity: emptyPayment,
-  };
-
-  const removeLiquidityInvitation = E(
-    amm.ammPublicFacet,
-  ).makeRemoveLiquidityInvitation();
-
-  const proposal = harden({
-    give: { Liquidity: emptyLiquidity },
-    want: {
-      Secondary: makeMoola(0n),
-      Central: centralTokens(0n),
-    },
-  });
-
-  const removeLiquiditySeat = await E(zoe).offer(
-    removeLiquidityInvitation,
-    proposal,
-    harden(paymentRecord),
-  );
-
-  t.is(
-    await E(removeLiquiditySeat).getOfferResult(),
-    'request to remove zero liquidity',
-    `No liquidity removed`,
-  );
-});
-
-test('amm bad add liquidity offer', async t => {
-  const centralLiquidityValue = 1_500_000_000n;
-  const secondaryLiquidityValue = 300_000_000n;
-
-  const { moolaKit, simoleanKit, bucksKit, moola, bucks } = setup();
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(console.log, 30n);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    simoleanKit,
-    timer,
-  );
-
-  await E(amm.ammPublicFacet).addIssuer(bucksKit.issuer, 'Bucks');
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    moolaKit.issuer,
-    'Moola',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const fundPoolProposal = harden({
-    give: {
-      Secondary: moola(secondaryLiquidityValue),
-      Central: bucks(centralLiquidityValue),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: moolaKit.mint.mintPayment(moola(secondaryLiquidityValue)),
-    Central: bucksKit.mint.mintPayment(bucks(centralLiquidityValue)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    fundPoolProposal,
-    payments,
-  );
-  await t.throwsAsync(async () => E(addLiquiditySeat).getOfferResult(), {
-    message:
-      'Brands in left "[Alleged: bucks brand]" and right "[Alleged: simoleans brand]" should match but do not',
-  });
-
-  await t.throwsAsync(
-    async () => E(amm.ammPublicFacet).getPoolMetrics(moolaKit.brand),
-    { message: '"secondaryBrandToPool" not found: "[Alleged: moola brand]"' },
-  );
-});
diff --git a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js b/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js
deleted file mode 100644
index 28f6fdf7ff6..00000000000
--- a/packages/inter-protocol/test/amm/vpool-xyk-amm/test-xyk-amm-swap.js
+++ /dev/null
@@ -1,1255 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { AmountMath, AssetKind, makeIssuerKit } from '@agoric/ertp';
-import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import {
-  ceilMultiplyBy,
-  getAmountOut,
-  makeRatio,
-  natSafeMath,
-} from '@agoric/zoe/src/contractSupport/index.js';
-import {
-  makeTrader,
-  outputFromInputPrice,
-  priceFromTargetOutput,
-  updatePoolState,
-} from '@agoric/zoe/test/autoswapJig.js';
-import {
-  assertAmountsEqual,
-  assertPayoutAmount,
-} from '@agoric/zoe/test/zoeTestHelpers.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
-import { E } from '@endo/eventual-send';
-import { BASIS_POINTS } from '../../../src/vpool-xyk-amm/constantProduct/defaults.js';
-import { subscriptionTracker } from '../../metrics.js';
-import { subscriptionKey } from '../../supports.js';
-import { setupAmmServices } from './setup.js';
-
-const { quote: q } = assert;
-const { ceilDivide } = natSafeMath;
-
-test.before(async t => {
-  const bundleCache = await unsafeMakeBundleCache('bundles/');
-  t.context = { bundleCache };
-});
-
-const initPoolCentral = 1_500_000_000n;
-const initPoolSecondary = 300_000_000n;
-
-const makePoolWithLiquidity = async (t, zoe, amm, secondR, centralR, kwd) => {
-  const moola = value => AmountMath.make(secondR.brand, value);
-  const c = value => AmountMath.make(centralR.brand, value);
-
-  const liquidityIssuer = await E(amm.ammPublicFacet).addIssuer(
-    secondR.issuer,
-    kwd,
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  const addPoolInvitation = await E(amm.ammPublicFacet).addPoolInvitation();
-
-  const proposal = harden({
-    give: {
-      Secondary: moola(initPoolSecondary),
-      Central: c(initPoolCentral),
-    },
-    want: { Liquidity: AmountMath.make(liquidityBrand, 1000n) },
-  });
-  const payments = {
-    Secondary: secondR.mint.mintPayment(moola(initPoolSecondary)),
-    Central: centralR.mint.mintPayment(c(initPoolCentral)),
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    proposal,
-    payments,
-  );
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Added Secondary and Central Liquidity`,
-  );
-
-  return { seat: addLiquiditySeat, liquidityIssuer };
-};
-
-/**
- * @param {IssuerKit} issuerRecord
- * @param {bigint} value
- */
-const makePurseWith = (issuerRecord, value) => {
-  const purse = issuerRecord.issuer.makeEmptyPurse();
-  const amount = AmountMath.make(issuerRecord.brand, value);
-  purse.deposit(issuerRecord.mint.mintPayment(amount));
-  return purse;
-};
-
-test('amm with non-fungible central token', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central', AssetKind.SET);
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  const timer = buildManualTimer(t.log, 30n);
-
-  await t.throwsAsync(
-    () => setupAmmServices(t, electorateTerms, centralR, timer),
-    {
-      message: `Central must be of kind ${q(AssetKind.NAT)}, not ${q(
-        AssetKind.SET,
-      )}`,
-    },
-    'test AssetKind.SET as central brand',
-  );
-});
-
-test('amm with valid offers', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  /** @param {NatValue} value */
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const simoleanKit = makeIssuerKit('simoleans');
-  const simoleans = value => AmountMath.make(simoleanKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-
-  const timer = buildManualTimer(t.log, 30n);
-  const protocolFeeRatio = makeRatio(6n, centralR.brand, BASIS_POINTS);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-  const publicFacet = amm.ammPublicFacet;
-  const alicePurses = [
-    makePurseWith(moolaKit, 100_000n),
-    makePurseWith(centralR, 50_000n + 4300n),
-    makePurseWith(simoleanKit, 39800n),
-  ];
-  const alice = await makeTrader(
-    alicePurses,
-    zoe,
-    publicFacet,
-    centralR.issuer,
-  );
-
-  const cAmount = centralTokens(50_000n);
-  const sAmount = moola(100_000n);
-  const aliceDetails = { cAmount, sAmount, liquidityValue: 49_000n };
-  const aliceExpected = {
-    c: 50_000n,
-    s: 100_000n,
-    l: 50_000n,
-    k: 50_000n * 100_000n,
-  };
-  const { liquidityIssuer } = await alice.addLiquidPoolAndCheck(
-    t,
-    aliceDetails,
-    aliceExpected,
-    moolaKit.issuer,
-    'Moola',
-  );
-
-  const moolaLiquidityBrand = await E(liquidityIssuer).getBrand();
-  const moolaLiquidity = value => AmountMath.make(moolaLiquidityBrand, value);
-
-  const moolaPools = {
-    Secondary: 100_000n,
-    Central: 50000n,
-  };
-
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {});
-
-  const bobStartingMoola = 17_000n;
-  const bobPurses = [
-    makePurseWith(moolaKit, bobStartingMoola),
-    makePurseWith(centralR, 700n),
-  ];
-  const bob = await makeTrader(bobPurses, zoe, publicFacet, centralR.issuer);
-
-  // Bob looks up what 17000 moola is worth in central tokens
-  const { amountOut: priceInCentrals, amountIn: costInMoola } = await E(
-    publicFacet,
-  ).getInputPrice(
-    moola(bobStartingMoola),
-    AmountMath.makeEmpty(centralR.brand),
-  );
-
-  const bobSeat = await bob.offerAndTrade(
-    priceInCentrals,
-    moola(bobStartingMoola),
-    true,
-  );
-
-  let runningFees = ceilMultiplyBy(priceInCentrals, protocolFeeRatio);
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {
-    Fee: runningFees,
-  });
-
-  const bobMoolaPayout1 = await E(bobSeat).getPayout('In');
-  const bobCentralPayout1 = await E(bobSeat).getPayout('Out');
-
-  assertAmountsEqual(
-    t,
-    await E(moolaKit.issuer).getAmountOf(bobMoolaPayout1),
-    AmountMath.subtract(moola(bobStartingMoola), costInMoola),
-    `bob might get moola back`,
-  );
-
-  assertAmountsEqual(
-    t,
-    await E(centralR.issuer).getAmountOf(bobCentralPayout1),
-    priceInCentrals,
-    `bob gets the same price as when he called the getInputPrice method`,
-  );
-
-  moolaPools.Secondary += costInMoola.value;
-  moolaPools.Central -= AmountMath.add(priceInCentrals, runningFees).value;
-
-  t.deepEqual(
-    await E(publicFacet).getPoolAllocation(moolaKit.brand),
-    {
-      Secondary: moola(moolaPools.Secondary),
-      Central: centralTokens(moolaPools.Central),
-      Liquidity: moolaLiquidity(0n),
-    },
-    `pool allocation added the moola and subtracted the central tokens`,
-  );
-
-  const bobCentralPurse = await E(centralR.issuer).makeEmptyPurse();
-  await E(bobCentralPurse).deposit(bobCentralPayout1);
-
-  // Bob looks up how much 700 central tokens are worth in moola
-  const priceFor700 = await E(publicFacet).getInputPrice(
-    centralTokens(700n),
-    AmountMath.makeEmpty(moolaKit.brand),
-  );
-  t.deepEqual(
-    priceFor700,
-    {
-      amountOut: moola(1877n),
-      amountIn: centralTokens(700n),
-    },
-    `the fee was one moola over the two trades`,
-  );
-
-  // Bob makes another offer and swaps
-  const bobSeat2 = await bob.offerAndTrade(
-    moola(1877n),
-    centralTokens(700n),
-    true,
-  );
-
-  runningFees = AmountMath.add(
-    runningFees,
-    ceilMultiplyBy(centralTokens(700n), protocolFeeRatio),
-  );
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {
-    Fee: runningFees,
-  });
-
-  t.is(
-    await E(bobSeat2).getOfferResult(),
-    'Swap successfully completed.',
-    `second swap successful`,
-  );
-
-  const { toCentral: priceAuthority } = await E(
-    publicFacet,
-  ).getPriceAuthorities(moolaKit.brand);
-
-  const quoteBob2 = await E(priceAuthority).quoteGiven(
-    moola(5000n),
-    centralR.brand,
-  );
-  assertAmountsEqual(
-    t,
-    getAmountOut(quoteBob2),
-    AmountMath.make(centralR.brand, 1801n),
-  );
-
-  const bobMoolaPayout2 = await E(bobSeat2).getPayout('Out');
-  const bobCentralPayout2 = await E(bobSeat2).getPayout('In');
-
-  t.deepEqual(
-    await E(moolaKit.issuer).getAmountOf(bobMoolaPayout2),
-    moola(1877n),
-    `bob gets 1877 moola back`,
-  );
-  t.deepEqual(
-    await E(centralR.issuer).getAmountOf(bobCentralPayout2),
-    centralTokens(0n),
-    `bob gets no central tokens back`,
-  );
-  t.deepEqual(
-    await E(publicFacet).getPoolAllocation(moolaKit.brand),
-    {
-      Secondary: moola(115121n),
-      Central: centralTokens(43453n),
-      Liquidity: moolaLiquidity(0n),
-    },
-    `fee added to liquidity pool`,
-  );
-
-  // Alice adds simoleans and central tokens to the simolean
-  // liquidity pool. 39800 simoleans = 4300 central tokens at the time of
-  // the liquidity adding
-
-  const simoleanLiquidityDetail = {
-    cAmount: centralTokens(4300n),
-    sAmount: simoleans(39800n),
-    liquidityValue: 3300n,
-  };
-  const simoleanLiquidityExpected = {
-    c: 4300n,
-    s: 39800n,
-    l: 4300n,
-    k: 4300n * 39800n,
-  };
-  const { liquidityIssuer: simoleanLiquidityIssuer, seat: aliceSeat2 } =
-    await alice.addLiquidPoolAndCheck(
-      t,
-      simoleanLiquidityDetail,
-      simoleanLiquidityExpected,
-      simoleanKit.issuer,
-      'Simoleans',
-    );
-
-  const simoleanLiquidityBrand = await E(simoleanLiquidityIssuer).getBrand();
-  const simoleanLiquidity = value =>
-    AmountMath.make(simoleanLiquidityBrand, value);
-  const quoteLiquidation2 = await E(priceAuthority).quoteGiven(
-    moola(5000n),
-    centralR.brand,
-  );
-  // a simolean trade had no effect on moola prices
-  assertAmountsEqual(
-    t,
-    getAmountOut(quoteLiquidation2),
-    AmountMath.make(centralR.brand, 1801n),
-  );
-  t.is(
-    await E(aliceSeat2).getOfferResult(),
-    'Added liquidity.',
-    `Alice added simoleans and central liquidity`,
-  );
-
-  const simoleanLiquidityPayout = await E(aliceSeat2).getPayout('Liquidity');
-
-  t.deepEqual(
-    await E(simoleanLiquidityIssuer).getAmountOf(simoleanLiquidityPayout),
-    simoleanLiquidity(3300n),
-    `simoleanLiquidity minted was equal to the amount of central tokens added to pool`,
-  );
-  t.deepEqual(
-    await E(publicFacet).getPoolAllocation(simoleanKit.brand),
-    harden({
-      Secondary: simoleans(39800n),
-      Central: centralTokens(4300n),
-      Liquidity: simoleanLiquidity(0n),
-    }),
-    `The poolAmounts record should contain the new liquidity`,
-  );
-});
-
-test('amm doubleSwap', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const simoleanKit = makeIssuerKit('simoleans');
-  const simoleans = value => AmountMath.make(simoleanKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(t.log, 30n);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  // Setup Alice
-  const aliceMoolaPayment = moolaKit.mint.mintPayment(moola(100000n));
-  // Let's assume that central tokens are worth 2x as much as moola
-  const aliceCentralPayment = centralR.mint.mintPayment(centralTokens(50000n));
-  const aliceSimoleanPayment = simoleanKit.mint.mintPayment(simoleans(39800n));
-
-  // Setup Bob
-  const bobSimoleanPayment = simoleanKit.mint.mintPayment(simoleans(4000n));
-  const bobMoolaPayment = moolaKit.mint.mintPayment(moola(5000n));
-
-  const ammInstance = await amm.instance;
-
-  const metricsSub = await E(amm.ammPublicFacet).getMetrics();
-  const m = await subscriptionTracker(t, metricsSub);
-  await m.assertInitial({ XYK: [] });
-
-  const aliceAddLiquidityInvitation = E(
-    amm.ammPublicFacet,
-  ).makeAddLiquidityInvitation();
-
-  const { liquidityIssuer: moolaLiquidityIssuer } = await makePoolWithLiquidity(
-    t,
-    zoe,
-    amm,
-    moolaKit,
-    centralR,
-    'Moola',
-  );
-
-  await m.assertChange({ XYK: { 0: moolaKit.brand } });
-
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-  const moolaLiquidity = value => AmountMath.make(moolaLiquidityBrand, value);
-
-  const { liquidityIssuer: simoleanLiquidityIssuer } =
-    await makePoolWithLiquidity(t, zoe, amm, simoleanKit, centralR, 'Simolean');
-
-  const simoleanLiquidityBrand = await E(simoleanLiquidityIssuer).getBrand();
-  const simoleanLiquidity = value =>
-    AmountMath.make(simoleanLiquidityBrand, value);
-
-  await m.assertChange({ XYK: { 1: simoleanKit.brand } });
-
-  const issuerKeywordRecord = await E(zoe).getIssuers(ammInstance);
-  t.deepEqual(
-    issuerKeywordRecord,
-    harden({
-      Central: centralR.issuer,
-      Moola: moolaKit.issuer,
-      MoolaLiquidity: moolaLiquidityIssuer,
-      Simolean: simoleanKit.issuer,
-      SimoleanLiquidity: simoleanLiquidityIssuer,
-    }),
-    `There are keywords for central token and two additional tokens and liquidity`,
-  );
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    {
-      Central: centralTokens(initPoolCentral),
-      Liquidity: moolaLiquidity(0n),
-      Secondary: moola(initPoolSecondary),
-    },
-    `The pool for moola should be initalized`,
-  );
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(simoleanKit.brand),
-    {
-      Central: centralTokens(initPoolCentral),
-      Liquidity: simoleanLiquidity(0n),
-      Secondary: simoleans(initPoolSecondary),
-    },
-    `The pool for simoleans should be initalized`,
-  );
-
-  // Alice adds liquidity for moola
-  // 10 moola = 5 central tokens at the time of the liquidity adding
-  // aka 2 moola = 1 central token
-  const aliceProposal = harden({
-    want: { Liquidity: moolaLiquidity(50000n) },
-    give: { Secondary: moola(100000n), Central: centralTokens(50000n) },
-  });
-  const alicePayments = {
-    Secondary: aliceMoolaPayment,
-    Central: aliceCentralPayment,
-  };
-
-  const addLiquiditySeat = await E(zoe).offer(
-    aliceAddLiquidityInvitation,
-    aliceProposal,
-    alicePayments,
-  );
-
-  t.is(
-    await E(addLiquiditySeat).getOfferResult(),
-    'Added liquidity.',
-    `Alice added moola and central liquidity`,
-  );
-  await E(addLiquiditySeat).getPayout('Liquidity');
-
-  // Alice adds simoleans and central tokens to the simolean
-  // liquidity pool. 398 simoleans = 43 central tokens at the time of
-  // the liquidity adding
-  //
-  const aliceSimLiquidityInvitation = E(
-    amm.ammPublicFacet,
-  ).makeAddLiquidityInvitation();
-  const aliceSimCentralProposal = harden({
-    want: { Liquidity: simoleanLiquidity(430n) },
-    give: { Secondary: simoleans(39800n), Central: centralTokens(43000n) },
-  });
-  const aliceCentralPayment2 = await centralR.mint.mintPayment(
-    centralTokens(43000n),
-  );
-  const aliceSimCentralPayments = {
-    Secondary: aliceSimoleanPayment,
-    Central: aliceCentralPayment2,
-  };
-
-  const aliceSeat2 = await E(zoe).offer(
-    aliceSimLiquidityInvitation,
-    aliceSimCentralProposal,
-    aliceSimCentralPayments,
-  );
-
-  t.is(
-    await E(aliceSeat2).getOfferResult(),
-    'Added liquidity.',
-    `Alice added simoleans and central liquidity`,
-  );
-
-  // Bob swaps moola for simoleans
-
-  // Bob looks up the value of 4000 simoleans in moola
-  const { amountOut: priceInMoola } = await E(amm.ammPublicFacet).getInputPrice(
-    simoleans(4000n),
-    AmountMath.makeEmpty(moolaKit.brand),
-  );
-
-  const bobInvitation = await E(amm.ammPublicFacet).makeSwapInInvitation();
-  const bobSimsForMoolaProposal = harden({
-    want: { Out: priceInMoola },
-    give: { In: simoleans(4000n) },
-  });
-  const simsForMoolaPayments = harden({
-    In: bobSimoleanPayment,
-  });
-
-  t.deepEqual(await E(amm.ammPublicFacet).getProtocolPoolBalance(), {});
-
-  const bobSeat1 = await E(zoe).offer(
-    bobInvitation,
-    bobSimsForMoolaProposal,
-    simsForMoolaPayments,
-  );
-  const bobMoolaPayout = await E(bobSeat1).getPayout('Out');
-  console.log('payout', await moolaKit.issuer.getAmountOf(bobMoolaPayout));
-  t.deepEqual(
-    await moolaKit.issuer.getAmountOf(bobMoolaPayout),
-    moola(3975n),
-    `bob gets 3975 moola`,
-  );
-
-  let runningFees = AmountMath.make(centralR.brand, 25n);
-  t.deepEqual(await E(amm.ammPublicFacet).getProtocolPoolBalance(), {
-    Fee: runningFees,
-  });
-
-  // Bob swaps simoleans for moola
-
-  // Bob looks up the value of 5000 moola in simoleans
-  const { amountOut: priceInSimoleans } = await E(
-    amm.ammPublicFacet,
-  ).getInputPrice(moola(5000n), AmountMath.makeEmpty(simoleanKit.brand));
-
-  const bobInvitation2 = await E(amm.ammPublicFacet).makeSwapInInvitation();
-  const bobMoolaForSimsProposal = harden({
-    want: { Out: priceInSimoleans },
-    give: { In: moola(5000n) },
-  });
-  const moolaForSimsPayments = harden({
-    In: bobMoolaPayment,
-  });
-
-  const prices = await E(amm.ammPublicFacet).getOutputPrice(
-    AmountMath.makeEmpty(moolaKit.brand),
-    simoleans(4000n),
-  );
-  t.deepEqual(
-    prices,
-    {
-      amountIn: moola(4025n),
-      amountOut: simoleans(4000n),
-    },
-    'near parity',
-  );
-
-  const bobSeat2 = await E(zoe).offer(
-    bobInvitation2,
-    bobMoolaForSimsProposal,
-    moolaForSimsPayments,
-  );
-  const bobSimoleanPayout = await E(bobSeat2).getPayout('Out');
-
-  t.deepEqual(
-    await simoleanKit.issuer.getAmountOf(bobSimoleanPayout),
-    simoleans(4970n),
-    `bob gets 4970 simoleans`,
-  );
-
-  runningFees = AmountMath.add(
-    runningFees,
-    AmountMath.make(centralR.brand, 30n),
-  );
-  t.deepEqual(await E(amm.ammPublicFacet).getProtocolPoolBalance(), {
-    Fee: runningFees,
-  });
-
-  const collectFeesInvitation = E(
-    amm.ammCreatorFacet,
-  ).makeCollectFeesInvitation();
-  const collectFeesSeat = await E(zoe).offer(
-    collectFeesInvitation,
-    undefined,
-    undefined,
-  );
-
-  const payout = await E(collectFeesSeat).getPayout('Fee');
-
-  await assertPayoutAmount(t, centralR.issuer, payout, runningFees);
-
-  t.deepEqual(await E(amm.ammPublicFacet).getProtocolPoolBalance(), {
-    Fee: AmountMath.makeEmpty(centralR.brand),
-  });
-});
-
-test('amm jig - swapOut uneven', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-  const simoleanKit = makeIssuerKit('simoleans');
-  const simoleans = value => AmountMath.make(simoleanKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-
-  const timer = buildManualTimer(t.log);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  // set up purses
-  const centralPayment = centralR.mint.mintPayment(centralTokens(30000000n));
-  const centralPurse = centralR.issuer.makeEmptyPurse();
-  await centralPurse.deposit(centralPayment);
-  const moolaPurse = moolaKit.issuer.makeEmptyPurse();
-  moolaPurse.deposit(moolaKit.mint.mintPayment(moola(20000000n)));
-  const simoleanPurse = simoleanKit.issuer.makeEmptyPurse();
-  simoleanPurse.deposit(simoleanKit.mint.mintPayment(simoleans(20000000n)));
-
-  /** @type {XYKAMMPublicFacet} */
-  // @ts-expect-error xxx 'amount' param can't type the brand
-  const publicFacet = amm.ammPublicFacet;
-  const creatorFacet = amm.ammCreatorFacet;
-
-  const { liquidityIssuer: moolaLiquidityIssuer } = await makePoolWithLiquidity(
-    t,
-    zoe,
-    amm,
-    moolaKit,
-    centralR,
-    'Moola',
-  );
-
-  const { liquidityIssuer: simoleanLiquidityIssuer } =
-    await makePoolWithLiquidity(
-      t,
-      zoe,
-      amm,
-      simoleanKit,
-      centralR,
-      'Simoleans',
-    );
-
-  const mIssuerKeywordRecord = {
-    Secondary: moolaKit.issuer,
-    Liquidity: moolaLiquidityIssuer,
-  };
-  const purses = [
-    moolaPurse,
-    E(moolaLiquidityIssuer).makeEmptyPurse(),
-    centralPurse,
-    simoleanPurse,
-    E(simoleanLiquidityIssuer).makeEmptyPurse(),
-  ];
-  const alice = await makeTrader(purses, zoe, publicFacet, centralR.issuer);
-
-  let mPoolState = {
-    c: 0n,
-    s: 0n,
-    l: 0n,
-    k: 0n,
-  };
-
-  // this test uses twice as much Central as Moola to make the price difference
-  // more visible.
-  const initmoolaLiquidityExpected = {
-    c: initPoolCentral,
-    s: initPoolSecondary,
-    l: initPoolCentral,
-    k: initPoolCentral * initPoolSecondary,
-    payoutC: 0n,
-    payoutS: 0n,
-    payoutL: initPoolCentral,
-  };
-  mPoolState = updatePoolState(mPoolState, initmoolaLiquidityExpected);
-
-  const sPoolState = {
-    c: 0n,
-    s: 0n,
-    l: 0n,
-    k: 0n,
-  };
-  const initSimLiqExpected = {
-    c: initPoolCentral,
-    s: initPoolSecondary,
-    l: initPoolCentral,
-    k: initPoolCentral * initPoolSecondary,
-    payoutC: 0n,
-    payoutS: 0n,
-    payoutL: initPoolCentral,
-  };
-  updatePoolState(sPoolState, initSimLiqExpected);
-
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {});
-
-  // trade for central specifying 30000 output: moola price 15092
-  // Notice that it takes ~ half as much moola as the desired Central
-  const cGain = 30000n;
-  // The pool will be charged the protocol fee on top of deltaY
-  const protocolFee1 = ceilDivide(cGain * 6n, 10000n - 6n);
-  const deltaY = priceFromTargetOutput(
-    cGain + protocolFee1,
-    mPoolState.c,
-    mPoolState.s,
-    0n, // no fee calculation
-  );
-  const poolFee1 = ceilDivide(deltaY * 24n, 10000n);
-  const yChange1 = deltaY + poolFee1;
-  const deltaX = outputFromInputPrice(mPoolState.s, mPoolState.c, deltaY, 0n);
-
-  // overpay
-  const moolaIn = 16000n;
-  const tradeDetailsB = {
-    inAmount: moola(moolaIn),
-    outAmount: centralTokens(deltaX - protocolFee1),
-  };
-
-  const expectedB = {
-    c: mPoolState.c - deltaX,
-    s: mPoolState.s + yChange1,
-    l: initPoolCentral,
-    k: (mPoolState.c - deltaX) * (mPoolState.s + yChange1),
-    out: deltaX - protocolFee1,
-    in: moolaIn - yChange1,
-  };
-
-  await alice.tradeAndCheck(
-    t,
-    false,
-    mPoolState,
-    tradeDetailsB,
-    expectedB,
-    mIssuerKeywordRecord,
-  );
-  mPoolState = updatePoolState(mPoolState, expectedB);
-
-  let expectedPoolBalance = protocolFee1;
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {
-    Fee: AmountMath.make(centralR.brand, expectedPoolBalance),
-  });
-
-  // trade to get 25000 moola: central price: 49949, approximately double.
-  const gainM = 25000n;
-  const mPriceC = priceFromTargetOutput(gainM, mPoolState.s, mPoolState.c, 0n);
-
-  t.is(mPriceC, 125_006n);
-  const actualGainM = outputFromInputPrice(
-    mPoolState.c,
-    mPoolState.s,
-    mPriceC,
-    0n,
-  );
-  const poolFee2 = ceilDivide(mPriceC * 24n, 10000n);
-
-  // The price will be deltaX + protocolFee. The user will pay this to the pool
-  const expectedProtocolCharge2 = ceilDivide(mPriceC * 6n, 10_000n);
-  const alicePays = mPriceC + expectedProtocolCharge2 + poolFee2;
-
-  const tradeDetailsC = {
-    inAmount: centralTokens(alicePays),
-    outAmount: moola(gainM),
-  };
-
-  const expectedC = {
-    c: mPoolState.c + mPriceC + poolFee2,
-    s: mPoolState.s - actualGainM,
-    l: initPoolCentral,
-    k: (mPoolState.c + mPriceC + poolFee2) * (mPoolState.s - actualGainM),
-    out: actualGainM,
-    in: gainM - actualGainM,
-  };
-  await alice.tradeAndCheck(
-    t,
-    false,
-    mPoolState,
-    tradeDetailsC,
-    expectedC,
-    mIssuerKeywordRecord,
-  );
-
-  expectedPoolBalance += expectedProtocolCharge2;
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {
-    Fee: AmountMath.make(centralR.brand, expectedPoolBalance),
-  });
-
-  const collectFeesInvitation = E(creatorFacet).makeCollectFeesInvitation();
-  const collectFeesSeat = await E(zoe).offer(
-    collectFeesInvitation,
-    undefined,
-    undefined,
-  );
-
-  const payout = await E(collectFeesSeat).getPayout('Fee');
-
-  await assertPayoutAmount(
-    t,
-    centralR.issuer,
-    payout,
-    AmountMath.make(centralR.brand, expectedPoolBalance),
-    'payout of collectFeesSeat',
-  );
-
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {
-    Fee: AmountMath.makeEmpty(centralR.brand),
-  });
-});
-
-test('amm jig - breaking scenario', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const centralTokens = value => AmountMath.make(centralR.brand, value);
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-
-  const timer = buildManualTimer(t.log);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  const publicFacet = amm.ammPublicFacet;
-
-  // set up purses
-  const centralPayment = centralR.mint.mintPayment(
-    centralTokens(55825056949339n),
-  );
-  const centralPurse = E(centralR.issuer).makeEmptyPurse();
-  await E(centralPurse).deposit(centralPayment);
-  const moolaPurse = moolaKit.issuer.makeEmptyPurse();
-  moolaPurse.deposit(
-    moolaKit.mint.mintPayment(moola(2396247730468n + 4145005n)),
-  );
-
-  const purses = [moolaPurse, centralPurse];
-  const alice = await makeTrader(purses, zoe, publicFacet, centralR.issuer);
-
-  const initMoolaLiquidityDetails = {
-    cAmount: centralTokens(50825056949339n),
-    sAmount: moola(2196247730468n),
-    liquidityValue: 50825056948339n,
-  };
-  const initMoolaLiquidityExpected = {
-    c: 50825056949339n,
-    s: 2196247730468n,
-    l: 50825056949339n,
-    k: 50825056949339n * 2196247730468n,
-  };
-  const { liquidityIssuer: moolaLiquidityIssuer } =
-    await alice.addLiquidPoolAndCheck(
-      t,
-      initMoolaLiquidityDetails,
-      initMoolaLiquidityExpected,
-      moolaKit.issuer,
-      'Moola',
-    );
-
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-  const displayInfo = await E(moolaLiquidityBrand).getDisplayInfo();
-  t.is(displayInfo.decimalPlaces, 6);
-
-  t.deepEqual(await E(publicFacet).getProtocolPoolBalance(), {});
-
-  const quoteFromRun = await E(publicFacet).getInputPrice(
-    centralTokens(73000000n),
-    AmountMath.makeEmpty(moolaKit.brand),
-  );
-  t.deepEqual(quoteFromRun, {
-    amountIn: centralTokens(72999997n),
-    amountOut: moola(3145001n),
-  });
-
-  const newQuoteFromRun = await E(publicFacet).getInputPrice(
-    quoteFromRun.amountIn,
-    AmountMath.makeEmpty(moolaKit.brand),
-  );
-
-  t.truthy(AmountMath.isGTE(quoteFromRun.amountIn, newQuoteFromRun.amountIn));
-  t.truthy(AmountMath.isGTE(newQuoteFromRun.amountOut, quoteFromRun.amountOut));
-
-  const quoteToRun = await E(publicFacet).getOutputPrice(
-    AmountMath.makeEmpty(moolaKit.brand),
-    centralTokens(370000000n),
-  );
-  const newQuoteToRun = await E(publicFacet).getOutputPrice(
-    AmountMath.makeEmpty(moolaKit.brand),
-    quoteToRun.amountOut,
-  );
-  t.deepEqual(quoteToRun.amountIn, newQuoteToRun.amountIn);
-  t.deepEqual(newQuoteToRun.amountOut, quoteToRun.amountOut);
-});
-
-// This demonstrates that Zoe can reallocate empty amounts. i.e. that
-// https://github.com/Agoric/agoric-sdk/issues/3033 stays fixed
-test('zoe allow empty reallocations', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(t.log, 30n);
-
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  const collectFeesInvitation2 = E(
-    amm.ammCreatorFacet,
-  ).makeCollectFeesInvitation();
-  const collectFeesSeat2 = await E(zoe).offer(
-    collectFeesInvitation2,
-    undefined,
-    undefined,
-  );
-
-  const payout = await E(collectFeesSeat2).getPayout('Fee');
-  const result = await E(collectFeesSeat2).getOfferResult();
-
-  t.deepEqual(result, 'paid out 0');
-  await assertPayoutAmount(
-    t,
-    centralR.issuer,
-    payout,
-    AmountMath.makeEmpty(centralR.brand),
-  );
-});
-
-const makeAddInitialLiquidity = (t, zoe, amm, moolaKit, centralR) => {
-  return async (moola, central) => {
-    const centralTokens = value => AmountMath.make(centralR.brand, value);
-    const makeMoola = value => AmountMath.make(moolaKit.brand, value);
-
-    const purses = [
-      makePurseWith(moolaKit, moola),
-      makePurseWith(centralR, central),
-    ];
-    const alice = await makeTrader(
-      purses,
-      zoe,
-      amm.ammPublicFacet,
-      centralR.issuer,
-    );
-    const details = {
-      cAmount: centralTokens(central),
-      sAmount: makeMoola(moola),
-      liquidityValue: central - 1000n,
-    };
-    const aliceExpected = {
-      c: central,
-      s: moola,
-      l: 50000n,
-      k: central * moola,
-    };
-    const { seat, liquidityIssuer } = await alice.addLiquidPoolAndCheck(
-      t,
-      details,
-      aliceExpected,
-      moolaKit.issuer,
-      'Moola',
-    );
-
-    t.is(
-      await E(seat).getOfferResult(),
-      'Added liquidity.',
-      `Alice added moola and central liquidity`,
-    );
-
-    return liquidityIssuer;
-  };
-};
-
-const makeAddLiquidity = (t, zoe, amm, moolaKit, centralR, moolaLiqIssuer) => {
-  return async (moola, central, priorState, expected) => {
-    const centralTokens = value => AmountMath.make(centralR.brand, value);
-    const makeMoola = value => AmountMath.make(moolaKit.brand, value);
-
-    const purses = [
-      makePurseWith(moolaKit, moola),
-      makePurseWith(centralR, central),
-    ];
-    const alice = await makeTrader(
-      purses,
-      zoe,
-      amm.ammPublicFacet,
-      centralR.issuer,
-    );
-    const details = {
-      cAmount: centralTokens(central),
-      sAmount: makeMoola(moola),
-      liquidityValue: central - 1000n,
-    };
-
-    await alice.addLiquidityAtRateAndCheck(t, priorState, details, expected, {
-      Liquidity: moolaLiqIssuer,
-      Secondary: moolaKit.issuer,
-    });
-  };
-};
-
-test('amm adding liquidity', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(t.log, 30n);
-  const { zoe, amm } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-
-  const metricsSub = await E(amm.ammPublicFacet).getMetrics();
-  const m = await subscriptionTracker(t, metricsSub);
-  await m.assertInitial({ XYK: [] });
-
-  await t.throwsAsync(
-    () => E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    { message: /"secondaryBrandToPool" not found: / },
-    "The pool hasn't been created yet",
-  );
-
-  const addInitialLiquidity = await makeAddInitialLiquidity(
-    t,
-    zoe,
-    amm,
-    moolaKit,
-    centralR,
-  );
-  // add initial liquidity at 10000:50000
-  const liquidityIssuer = await addInitialLiquidity(10000n, 50000n);
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-  await m.assertChange({ XYK: { 0: moolaKit.brand } });
-
-  const poolMetricsSub = await E(amm.ammPublicFacet).getPoolMetrics(
-    moolaKit.brand,
-  );
-  const p = await subscriptionTracker(t, poolMetricsSub);
-  await p.assertInitial({
-    centralAmount: AmountMath.makeEmpty(centralR.brand),
-    secondaryAmount: moola(0n),
-    liquidityTokens: AmountMath.makeEmpty(liquidityBrand),
-  });
-
-  const allocation = (c, l, s) => ({
-    Central: AmountMath.make(centralR.brand, c),
-    Liquidity: AmountMath.make(liquidityBrand, l),
-    Secondary: moola(s),
-  });
-
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(50000n, 0n, 10000n),
-    `poolAllocation after initialization`,
-  );
-
-  const expected0 = {
-    c: 50_000n,
-    s: 10_000n,
-    l: 50_000n,
-    k: 500_000_000n,
-    payoutL: 84_115n,
-    payoutC: 0n,
-    payoutS: 11n,
-  };
-
-  await p.assertState({
-    centralAmount: AmountMath.make(centralR.brand, expected0.c),
-    secondaryAmount: moola(expected0.s),
-    liquidityTokens: AmountMath.make(liquidityBrand, expected0.l),
-  });
-
-  const poolState1 = {
-    c: 50_000n,
-    s: 10_000n,
-    l: 50_000n,
-    k: 500_000_000n,
-  };
-  const expected1 = {
-    c: 119996n,
-    s: 29989n,
-    l: 134115n,
-    k: 119996n * 29989n,
-    payoutL: 84_115n,
-    payoutC: 0n,
-    payoutS: 11n,
-  };
-
-  const addLiquidity = makeAddLiquidity(
-    t,
-    zoe,
-    amm,
-    moolaKit,
-    centralR,
-    liquidityIssuer,
-  );
-
-  // Add liquidity. Offer 20_000:70_000.
-  await addLiquidity(20_000n, 70_000n, poolState1, expected1);
-  // After the trade, this will increase the pool by about 150%
-
-  await p.assertState({
-    centralAmount: AmountMath.make(centralR.brand, expected1.c),
-    secondaryAmount: moola(expected1.s),
-    liquidityTokens: AmountMath.make(liquidityBrand, expected1.l),
-  });
-
-  // The pool will have 10K + 20K and 50K + 70K after
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(119_996n, 0n, 29_989n),
-    `poolAllocation after initialization`,
-  );
-
-  const poolState2 = {
-    c: expected1.c,
-    s: expected1.s,
-    l: expected1.l,
-    k: expected1.k,
-  };
-  // await assertPayouts(l3, 80_680n, c3, 0n, s3, 16n);
-  const expected2 = {
-    c: 219_985n,
-    s: 41_973n,
-    l: 214_795n,
-    k: 219_985n * 41_973n,
-    payoutL: 80_680n,
-    payoutC: 0n,
-    payoutS: 16n,
-  };
-
-  // Add liquidity. Offer 12_000:100_000.
-  await addLiquidity(12_000n, 100_000n, poolState2, expected2);
-  await p.assertState({
-    centralAmount: AmountMath.make(centralR.brand, expected2.c),
-    secondaryAmount: moola(expected2.s),
-    liquidityTokens: AmountMath.make(liquidityBrand, expected2.l),
-  });
-
-  // The pool should now have just under 50K + 70K + 60K and 10K + 14K + 12K
-  t.deepEqual(
-    await E(amm.ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    allocation(219985n, 0n, 41973n),
-    `poolAllocation after initialization`,
-  );
-});
-
-test('storage', async t => {
-  // Set up central token
-  const centralR = makeIssuerKit('central');
-  const moolaR = makeIssuerKit('moola');
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
-  // This timer is only used to build quotes. Let's make it non-zero
-  const timer = buildManualTimer(t.log, 30n);
-  const { zoe, amm, mockChainStorage } = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-  );
-  t.is(
-    await subscriptionKey(E(amm.ammPublicFacet).getSubscription()),
-    'mockChainStorageRoot.amm.governance',
-  );
-  t.like(mockChainStorage.getBody('mockChainStorageRoot.amm.governance'), {
-    current: {
-      Electorate: { type: 'invitation' },
-      MinInitialPoolLiquidity: { type: 'amount' },
-      PoolFee: { type: 'nat' },
-      ProtocolFee: { type: 'nat' },
-    },
-  });
-
-  t.is(
-    await subscriptionKey(E(amm.ammPublicFacet).getMetrics()),
-    'mockChainStorageRoot.amm.metrics',
-  );
-  t.deepEqual(mockChainStorage.getBody('mockChainStorageRoot.amm.metrics'), {
-    XYK: [],
-  });
-
-  const addInitialLiquidity = await makeAddInitialLiquidity(
-    t,
-    zoe,
-    amm,
-    moolaR,
-    centralR,
-  );
-  await addInitialLiquidity(10000n, 50000n);
-  t.like(mockChainStorage.getBody('mockChainStorageRoot.amm.pool0.init'), {
-    liquidityIssuerRecord: {
-      assetKind: 'nat',
-      brand: { iface: 'Alleged: MoolaLiquidity brand' },
-      displayInfo: {
-        assetKind: 'nat',
-      },
-      issuer: {
-        iface: 'Alleged: MoolaLiquidity issuer',
-      },
-    },
-  });
-
-  t.is(
-    await subscriptionKey(E(amm.ammPublicFacet).getPoolMetrics(moolaR.brand)),
-    'mockChainStorageRoot.amm.pool0.metrics',
-  );
-  t.like(mockChainStorage.getBody('mockChainStorageRoot.amm.pool0.metrics'), {
-    centralAmount: {
-      brand: { iface: 'Alleged: central brand' },
-      value: 50000n,
-    },
-    liquidityTokens: {
-      brand: { iface: 'Alleged: MoolaLiquidity brand' },
-      value: 50000n,
-    },
-    secondaryAmount: {
-      brand: { iface: 'Alleged: moola brand' },
-      value: 10000n,
-    },
-  });
-});
diff --git a/packages/inter-protocol/test/reserve/setup.js b/packages/inter-protocol/test/reserve/setup.js
index a3f447a6cb7..b90f0d36101 100644
--- a/packages/inter-protocol/test/reserve/setup.js
+++ b/packages/inter-protocol/test/reserve/setup.js
@@ -1,10 +1,19 @@
 import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
 import { E } from '@endo/eventual-send';
 import {
-  setUpZoeForTest,
-  setupAmmServices,
-} from '../amm/vpool-xyk-amm/setup.js';
-import { provideBundle } from '../supports.js';
+  makeAgoricNamesAccess,
+  makePromiseSpace,
+} from '@agoric/vats/src/core/utils.js';
+import { makeBoard } from '@agoric/vats/src/lib-board.js';
+import { setupReserve } from '../../src/proposals/econ-behaviors.js';
+
+import {
+  installPuppetGovernance,
+  makeMockChainStorageRoot,
+  provideBundle,
+} from '../supports.js';
+import { setUpZoeForTest } from '../psm/setupPsm.js';
+import { startEconomicCommittee } from '../../src/proposals/startEconCommittee.js';
 
 const reserveRoot = './src/reserve/assetReserve.js'; // package relative
 const faucetRoot = './test/vaultFactory/faucet.js';
@@ -14,51 +23,35 @@ const faucetRoot = './test/vaultFactory/faucet.js';
  */
 
 /**
- * NOTE: called separately by each test so AMM/zoe/priceAuthority don't interfere
+ * NOTE: called separately by each test so zoe/priceAuthority don't interfere
  *
  * @param {*} t
  * @param {ManualTimer | undefined} timer
  * @param {FarZoeKit} farZoeKit
- * @param {Issuer} runIssuer
- * @param {{ committeeName: string, committeeSize: number}} electorateTerms
  */
-const setupReserveBootstrap = async (
-  t,
-  timer,
-  farZoeKit,
-  runIssuer,
-  electorateTerms,
-) => {
-  const runBrand = await E(runIssuer).getBrand();
-  const centralR = { issuer: runIssuer, brand: runBrand };
-
-  const ammSpaces = await setupAmmServices(
-    t,
-    electorateTerms,
-    centralR,
-    timer,
-    farZoeKit,
-  );
-  const { produce } =
+const setupReserveBootstrap = async (t, timer, farZoeKit) => {
+  const space = /** @type {any} */ (makePromiseSpace());
+  const { produce, consume } =
     /** @type { import('../../src/proposals/econ-behaviors.js').EconomyBootstrapPowers } */ (
-      ammSpaces.space
+      space
     );
-  const zoe = await E.get(farZoeKit).zoe;
+
+  const { zoe, feeMintAccessP } = await E.get(farZoeKit);
 
   // @ts-expect-error could be undefined
   produce.chainTimerService.resolve(timer);
   produce.zoe.resolve(zoe);
+  const { agoricNames, agoricNamesAdmin, spaces } = makeAgoricNamesAccess();
+  produce.agoricNames.resolve(agoricNames);
+  produce.agoricNamesAdmin.resolve(agoricNamesAdmin);
+  produce.feeMintAccess.resolve(feeMintAccessP);
 
-  const newAmm = {
-    ammCreatorFacet: ammSpaces.amm.ammCreatorFacet,
-    ammPublicFacet: ammSpaces.amm.ammPublicFacet,
-    instance: ammSpaces.amm.instance,
-  };
+  installPuppetGovernance(zoe, spaces.installation.produce);
+  const mockChainStorage = makeMockChainStorageRoot();
+  produce.chainStorage.resolve(mockChainStorage);
+  produce.board.resolve(makeBoard());
 
-  return {
-    amm: newAmm,
-    ...ammSpaces.space,
-  };
+  return { produce, consume, ...spaces, mockChainStorage };
 };
 
 /**
@@ -87,18 +80,24 @@ export const setupReserveServices = async (
   const runIssuer = await E(zoe).getFeeIssuer();
   const runBrand = await E(runIssuer).getBrand();
 
-  const spaces = await setupReserveBootstrap(
-    t,
-    timer,
-    // @ts-expect-error confusion about awaited return types
-    farZoeKit,
-    runIssuer,
-    electorateTerms,
-  );
-  const { produce, consume, brand, issuer, installation, instance } = spaces;
+  // @ts-expect-error a non-promise can be used where a promise is expected.
+  const spaces = await setupReserveBootstrap(t, timer, farZoeKit);
+  startEconomicCommittee(spaces, {
+    options: { econCommitteeOptions: electorateTerms },
+  });
 
+  const { produce, consume, brand, issuer, installation, instance } = spaces;
   const reserveBundle = await provideBundle(t, reserveRoot, 'reserve');
   installation.produce.reserve.resolve(E(zoe).install(reserveBundle));
+
+  const istIssuer = await E(zoe).getFeeIssuer();
+  const istBrand = await E(istIssuer).getBrand();
+
+  brand.produce.IST.resolve(istBrand);
+  issuer.produce.IST.resolve(istIssuer);
+
+  await setupReserve(spaces);
+
   const faucetBundle = await provideBundle(t, faucetRoot, 'faucet');
   const faucetInstallation = E(zoe).install(faucetBundle);
   brand.produce.IST.resolve(runBrand);
@@ -106,8 +105,6 @@ export const setupReserveServices = async (
   const feeMintAccess = await feeMintAccessP;
   produce.feeMintAccess.resolve(await feeMintAccess);
 
-  /** @type {Promise<import('@agoric/governance/tools/puppetContractGovernor.js').PuppetContractGovernorKit<import('../../src/reserve/assetReserve.js').start>['creatorFacet']>} */
-  // @ts-expect-error cast for testing env
   const governorCreatorFacet = E.get(consume.reserveKit).governorCreatorFacet;
   const governorInstance = await instance.consume.reserveGovernor;
   const governorPublicFacet = await E(zoe).getPublicFacet(governorInstance);
diff --git a/packages/inter-protocol/test/reserve/test-reserve.js b/packages/inter-protocol/test/reserve/test-reserve.js
index 97f9f5fc2fc..36fcc8eb562 100644
--- a/packages/inter-protocol/test/reserve/test-reserve.js
+++ b/packages/inter-protocol/test/reserve/test-reserve.js
@@ -3,7 +3,6 @@ import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
 
 import { AmountMath, makeIssuerKit } from '@agoric/ertp';
 import { unsafeMakeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { eventLoopIteration } from '@agoric/zoe/tools/eventLoopIteration.js';
 import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
 import { E } from '@endo/eventual-send';
 
@@ -11,41 +10,6 @@ import { setupReserveServices } from './setup.js';
 import { reserveInitialState, subscriptionTracker } from '../metrics.js';
 import { subscriptionKey } from '../supports.js';
 
-const addLiquidPool = async (
-  runPayment,
-  runIssuer,
-  space,
-  t,
-  moola,
-  moolaKit,
-  zoe,
-) => {
-  const poolVal = 1000n;
-  const { ammPublicFacet } = space.amm;
-
-  const runAmount = await E(runIssuer).getAmountOf(runPayment);
-  const ammProposal = harden({
-    give: {
-      Secondary: moola(poolVal),
-      Central: runAmount,
-    },
-  });
-  const ammPayments = {
-    Secondary: moolaKit.mint.mintPayment(moola(poolVal)),
-    Central: runPayment,
-  };
-
-  await E(ammPublicFacet).addIssuer(moolaKit.issuer, 'Moola');
-  const addPoolInvitation = await E(ammPublicFacet).addPoolInvitation();
-
-  const addLiquiditySeat = await E(zoe).offer(
-    addPoolInvitation,
-    ammProposal,
-    ammPayments,
-  );
-  return E(addLiquiditySeat).getOfferResult();
-};
-
 /**
  * @param {ERef<ZoeService>} zoe
  * @param {ERef<FeeMintAccess>} feeMintAccessP
@@ -91,95 +55,19 @@ test('reserve add collateral', async t => {
   const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 3 };
   const timer = buildManualTimer(t.log);
 
-  const { zoe, reserve, space, feeMintAccess, faucetInstallation } =
-    await setupReserveServices(t, electorateTerms, timer);
-  const runBrand = await space.brand.consume.IST;
-  const runIssuer = await space.issuer.consume.IST;
-  const runPayment = getRunFromFaucet(
-    zoe,
-    feeMintAccess,
-    faucetInstallation,
-    AmountMath.make(runBrand, 1000n),
-  );
-  await addLiquidPool(runPayment, runIssuer, space, t, moola, moolaKit, zoe);
-  const invitation = await E(
-    reserve.reservePublicFacet,
-  ).makeAddCollateralInvitation();
-
-  const proposal = { give: { Collateral: moola(100_000n) } };
-  const moolaPayment = moolaKit.mint.mintPayment(moola(100000n));
-  const payments = { Collateral: moolaPayment };
-  const collateralSeat = E(zoe).offer(invitation, proposal, payments);
-
-  t.is(
-    await E(collateralSeat).getOfferResult(),
-    'added Collateral to the Reserve',
-    `added moola to the collateral Reserve`,
-  );
-
-  const { ammPublicFacet } = space.amm;
-  const moolaLiquidityIssuer = E(ammPublicFacet).getLiquidityIssuer(
-    moolaKit.brand,
-  );
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-  t.deepEqual(
-    await E(reserve.reserveCreatorFacet).getAllocations(),
-    harden({
-      Rmoola: moola(100_000n),
-      RmoolaLiquidity: AmountMath.make(moolaLiquidityBrand, 1000n),
-    }),
-    'expecting more',
-  );
-});
-
-test('governance add Liquidity to the AMM', async t => {
-  /** @param {NatValue} value */
-  const moolaKit = makeIssuerKit('moola');
-  const moola = value => AmountMath.make(moolaKit.brand, value);
-
-  const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 1 };
-  const timer = buildManualTimer(t.log);
-
-  const { zoe, reserve, space, governor, faucetInstallation, feeMintAccess } =
-    await setupReserveServices(t, electorateTerms, timer);
-  const runBrand = await space.brand.consume.IST;
-  const runIssuer = await space.issuer.consume.IST;
-  const runPayment = getRunFromFaucet(
-    zoe,
-    feeMintAccess,
-    faucetInstallation,
-    AmountMath.make(runBrand, 1000n),
-  );
-
-  const { ammPublicFacet } = space.amm;
-
-  await addLiquidPool(runPayment, runIssuer, space, t, moola, moolaKit, zoe);
-
-  const moolaLiquidityIssuer = E(ammPublicFacet).getLiquidityIssuer(
-    moolaKit.brand,
-  );
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
-
-  t.deepEqual(
-    await E(ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    harden({
-      Central: AmountMath.make(runBrand, 1000n),
-      Secondary: moola(1000n),
-      Liquidity: AmountMath.makeEmpty(moolaLiquidityBrand),
-    }),
-    'should be 80K',
+  const { zoe, reserve } = await setupReserveServices(
+    t,
+    electorateTerms,
+    timer,
   );
 
-  const metricsSub = await E(reserve.reserveCreatorFacet).getMetrics();
-  const m = await subscriptionTracker(t, metricsSub);
-  await m.assertInitial(reserveInitialState(AmountMath.makeEmpty(runBrand)));
-
+  await E(reserve.reserveCreatorFacet).addIssuer(moolaKit.issuer, 'Moola');
   const invitation = await E(
     reserve.reservePublicFacet,
   ).makeAddCollateralInvitation();
 
   const proposal = { give: { Collateral: moola(100_000n) } };
-  const moolaPayment = moolaKit.mint.mintPayment(moola(100_000n));
+  const moolaPayment = moolaKit.mint.mintPayment(moola(100000n));
   const payments = { Collateral: moolaPayment };
   const collateralSeat = E(zoe).offer(invitation, proposal, payments);
 
@@ -188,43 +76,9 @@ test('governance add Liquidity to the AMM', async t => {
     'added Collateral to the Reserve',
     `added moola to the collateral Reserve`,
   );
-
-  const params = harden([moola(90_000n), AmountMath.make(runBrand, 80_000n)]);
-  await E(governor.governorCreatorFacet).invokeAPI(
-    'addLiquidityToAmmPool',
-    params,
-  );
-  await eventLoopIteration();
-
-  t.deepEqual(
-    await E(reserve.reserveCreatorFacet).getAllocations(),
-    harden({
-      Rmoola: moola(10_000n),
-      RmoolaLiquidity: AmountMath.make(moolaLiquidityBrand, 85_622n),
-    }),
-    'expecting more',
-  );
-
-  t.deepEqual(
-    await E(ammPublicFacet).getPoolAllocation(moolaKit.brand),
-    harden({
-      Central: AmountMath.make(runBrand, 80_999n),
-      Secondary: moola(90_675n),
-      Liquidity: AmountMath.makeEmpty(moolaLiquidityBrand),
-    }),
-    'should be 80K',
-  );
-
-  await m.assertChange({
-    totalFeeMinted: { value: 80_000n },
-    allocations: {
-      Rmoola: moola(10_000n),
-      RmoolaLiquidity: AmountMath.make(moolaLiquidityBrand, 85_622n),
-    },
-  });
 });
 
-test('request more collateral than available', async t => {
+test('check allocations', async t => {
   /** @param {NatValue} value */
   const moolaKit = makeIssuerKit('moola');
   const moola = value => AmountMath.make(moolaKit.brand, value);
@@ -232,22 +86,16 @@ test('request more collateral than available', async t => {
   const electorateTerms = { committeeName: 'EnBancPanel', committeeSize: 1 };
   const timer = buildManualTimer(t.log);
 
-  const { zoe, reserve, space, governor, faucetInstallation, feeMintAccess } =
-    await setupReserveServices(t, electorateTerms, timer);
-
-  const runBrand = await space.brand.consume.IST;
-  const runIssuer = await space.issuer.consume.IST;
-  const runPayment = getRunFromFaucet(
-    zoe,
-    feeMintAccess,
-    faucetInstallation,
-    AmountMath.make(runBrand, 1000n),
+  const { zoe, reserve } = await setupReserveServices(
+    t,
+    electorateTerms,
+    timer,
   );
-  await addLiquidPool(runPayment, runIssuer, space, t, moola, moolaKit, zoe);
 
   const invitation = await E(
     reserve.reservePublicFacet,
   ).makeAddCollateralInvitation();
+  await E(reserve.reserveCreatorFacet).addIssuer(moolaKit.issuer, 'Moola');
 
   const proposal = { give: { Collateral: moola(10_000n) } };
   const moolaPayment = moolaKit.mint.mintPayment(moola(10_000n));
@@ -260,22 +108,10 @@ test('request more collateral than available', async t => {
     `added moola to the collateral Reserve`,
   );
 
-  const params = harden([moola(90_000n), AmountMath.make(runBrand, 80_000n)]);
-  await t.throwsAsync(
-    E(governor.governorCreatorFacet).invokeAPI('addLiquidityToAmmPool', params),
-    { message: 'insufficient reserves for that transaction' },
-  );
-
-  const { ammPublicFacet } = space.amm;
-  const moolaLiquidityIssuer = E(ammPublicFacet).getLiquidityIssuer(
-    moolaKit.brand,
-  );
-  const moolaLiquidityBrand = await E(moolaLiquidityIssuer).getBrand();
   t.deepEqual(
     await E(reserve.reserveCreatorFacet).getAllocations(),
     harden({
-      Rmoola: moola(10_000n),
-      RmoolaLiquidity: AmountMath.make(moolaLiquidityBrand, 1000n),
+      Moola: moola(10_000n),
     }),
     'expecting more',
   );
@@ -391,6 +227,7 @@ test('reserve burn IST', async t => {
   );
 
   const params = harden([oneKRun]);
+  // @ts-expect-error puppet governor
   await E(governor.governorCreatorFacet).invokeAPI(
     'burnFeesToReduceShortfall',
     params,
diff --git a/packages/inter-protocol/test/smartWallet/test-amm-integration.js b/packages/inter-protocol/test/smartWallet/test-amm-integration.js
deleted file mode 100644
index ef25b243a5f..00000000000
--- a/packages/inter-protocol/test/smartWallet/test-amm-integration.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import test from 'ava';
-
-// defer to after ps0
-test.todo('trade amm');
-// make a smart wallet
-// suggestIssuer
diff --git a/packages/inter-protocol/test/supports.js b/packages/inter-protocol/test/supports.js
index a2370e366b4..b9ab325420a 100644
--- a/packages/inter-protocol/test/supports.js
+++ b/packages/inter-protocol/test/supports.js
@@ -170,13 +170,13 @@ export const mintRunPayment = async (
 ) => {
   const feeMintAccess = await feeMintAccessP;
 
-  const { creatorFacet: ammSupplier } = await E(zoe).startInstance(
+  const { creatorFacet: bootstrapSupplier } = await E(zoe).startInstance(
     centralSupply,
     {},
     { bootstrapPaymentValue: value },
     { feeMintAccess },
   );
-  return E(ammSupplier).getBootstrapPayment();
+  return E(bootstrapSupplier).getBootstrapPayment();
 };
 
 /**
diff --git a/packages/inter-protocol/test/swingsetTests/governance/test-governance.js b/packages/inter-protocol/test/swingsetTests/governance/test-governance.js
index 85b9e4549c7..34e60ce18c1 100644
--- a/packages/inter-protocol/test/swingsetTests/governance/test-governance.js
+++ b/packages/inter-protocol/test/swingsetTests/governance/test-governance.js
@@ -22,14 +22,6 @@ test.before(async t => {
   const bundleCache = await unsafeMakeBundleCache('bundles/');
 
   const contractBundles = {
-    liquidateMinimum: await bundleCache.load(
-      './src/vaultFactory/liquidateMinimum.js',
-      'liquidateMinimum',
-    ),
-    amm: await bundleCache.load(
-      './src/vpool-xyk-amm/multipoolMarketMaker.js',
-      'amm',
-    ),
     vaultFactory: await bundleCache.load(
       './src/vaultFactory/vaultFactory.js',
       'VaultFactory',
diff --git a/packages/inter-protocol/test/swingsetTests/setup.js b/packages/inter-protocol/test/swingsetTests/setup.js
index 078bfdfdfdc..8e2825768ba 100644
--- a/packages/inter-protocol/test/swingsetTests/setup.js
+++ b/packages/inter-protocol/test/swingsetTests/setup.js
@@ -26,17 +26,14 @@ const setupBasicMints = () => {
 };
 
 const installContracts = async (zoe, cb) => {
-  const [liquidateMinimum, vaultFactory, electorate, counter, governor] =
-    await Promise.all([
-      E(zoe).install(cb.liquidateMinimum),
-      E(zoe).install(cb.vaultFactory),
-      E(zoe).install(cb.committee),
-      E(zoe).install(cb.binaryVoteCounter),
-      E(zoe).install(cb.contractGovernor),
-    ]);
+  const [vaultFactory, electorate, counter, governor] = await Promise.all([
+    E(zoe).install(cb.vaultFactory),
+    E(zoe).install(cb.committee),
+    E(zoe).install(cb.binaryVoteCounter),
+    E(zoe).install(cb.contractGovernor),
+  ]);
 
   const installations = {
-    liquidateMinimum,
     vaultFactory,
     electorate,
     counter,
@@ -213,7 +210,6 @@ const buildOwner = async (
     {
       priceAuthority: priceAuthorityKit.priceAuthority,
       loanTiming,
-      liquidationInstall: installations.liquidateMinimum,
       timer,
       electorateInvitationAmount: poserInvitationAmount,
       ammPublicFacet: ammMock,
diff --git a/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js
index 9340a718577..6e4d64e1f7d 100644
--- a/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js
+++ b/packages/inter-protocol/test/swingsetTests/vaultFactory/test-vaultFactory.js
@@ -9,8 +9,6 @@ import committeeBundle from '@agoric/governance/bundles/bundle-committee.js';
 import contractGovernorBundle from '@agoric/governance/bundles/bundle-contractGovernor.js';
 import binaryVoteCounterBundle from '@agoric/governance/bundles/bundle-binaryVoteCounter.js';
 
-import liquidateMinimumBundle from '../../../bundles/bundle-liquidateMinimum.js';
-import ammBundle from '../../../bundles/bundle-amm.js';
 import vaultFactoryBundle from '../../../bundles/bundle-vaultFactory.js';
 
 /** @type {import('ava').TestFn<{ data: { kernelBundles: any, config: any } }>} */
@@ -54,8 +52,6 @@ test.before(async t => {
   const kernelBundles = await buildKernelBundles();
 
   const contractBundles = {
-    liquidateMinimum: liquidateMinimumBundle,
-    amm: ammBundle,
     vaultFactory: vaultFactoryBundle,
     committee: committeeBundle,
     contractGovernor: contractGovernorBundle,
diff --git a/packages/inter-protocol/test/test-demoAMM.js b/packages/inter-protocol/test/test-demoAMM.js
index 2eff0fc328b..1f9c35346e5 100644
--- a/packages/inter-protocol/test/test-demoAMM.js
+++ b/packages/inter-protocol/test/test-demoAMM.js
@@ -23,13 +23,6 @@ test('uist -> IST formatting test utility', t => {
   t.is(showIST(3286010000000000n), '3_286_010_000 IST', 'regression 1');
 });
 
-test('ammPoolRunDeposits: check total, WETH', t => {
-  const actual = ammPoolRunDeposits(AMMDemoState);
-  // t.log(actual);
-  t.deepEqual(showIST(actual.ammTotal), '3_380_790_000 IST');
-  t.deepEqual(showIST(actual.balances.WETH), '3_286_010_000 IST');
-});
-
 test('splitAllCentralPayments: count entries, spot check', async t => {
   const central = makeIssuerKit(
     Stable.symbol,
diff --git a/packages/inter-protocol/test/test-gov-collateral.js b/packages/inter-protocol/test/test-gov-collateral.js
index 0e473a8d498..509298d5d12 100644
--- a/packages/inter-protocol/test/test-gov-collateral.js
+++ b/packages/inter-protocol/test/test-gov-collateral.js
@@ -316,9 +316,6 @@ const makeScenario = async (t, { env = process.env } = {}) => {
     ]);
   };
 
-  /** @type {PromiseKit<string>} */
-  const atomIssuerPK = makePromiseKit();
-
   const enactVaultAssetProposal = async () => {
     env.INTERCHAIN_DENOM = 'ibc/abc123';
     await evalProposals([coreProposals.addCollateral]);
@@ -345,49 +342,11 @@ const makeScenario = async (t, { env = process.env } = {}) => {
   const makeBenefactor = home => {
     const {
       agoricNames,
-      board,
       zoe,
       wallet: { purses },
     } = home;
 
     return Far('benefactor', {
-      // This isn't used now that we make the pool from a denom
-      // in publishInterchainAssetFromBank in addAssetToVault.js
-      // But it should still work. TODO: Perhaps we should test both ways?
-      // i.e. from a board ID as well?
-      makePool: async (atomQty = 500n, istQty = 1000n) => {
-        const istBrand = await E(agoricNames).lookup('brand', 'RUN');
-        const istAmt = qty => AmountMath.make(istBrand, qty * UNIT);
-        const interchainPoolAPI = E(zoe).getPublicFacet(
-          E(agoricNames).lookup('instance', 'interchainPool'),
-        );
-
-        const proposal1 = harden({ give: { Central: istAmt(istQty) } });
-        const centralPmt = await E(purses.ist).withdraw(proposal1.give.Central);
-        const inv1 = await E(interchainPoolAPI).makeInterchainPoolInvitation();
-        const seat1 = await E(zoe).offer(
-          inv1,
-          proposal1,
-          harden({ Central: centralPmt }),
-          harden({ denom: 'ibc/abc123' }),
-        );
-        const { invitation: inv2, issuer: ibcIssuer } = await E(
-          seat1,
-        ).getOfferResult();
-        atomIssuerPK.resolve(E(board).getId(ibcIssuer));
-        const ibcBrand = await E(ibcIssuer).getBrand();
-        const atomAmt = qty => AmountMath.make(ibcBrand, qty * UNIT);
-
-        const proposal2 = harden({ give: { Secondary: atomAmt(atomQty) } });
-        const pmt2 = await E(purses.atom).withdraw(proposal2.give.Secondary);
-        const seat2 = await E(zoe).offer(
-          inv2,
-          proposal2,
-          harden({ Secondary: pmt2 }),
-        );
-        t.deepEqual(await E(seat2).getOfferResult(), 'Added liquidity.');
-      },
-
       depositInReserve: async (qty = 10_000n) => {
         const ibcAtomBrand = await E(agoricNames).lookup('brand', 'IbcATOM');
         /** @type {ERef<import('../src/reserve/assetReserve').AssetReservePublicFacet>} */
@@ -457,7 +416,7 @@ test('Benefactor can add to reserve', async t => {
   await s.startDevNet();
   await s.provisionMembers();
   await s.startRunPreview();
-  // await s.benefactor.makePool(2000n, 1000n);
+
   await Promise.all([
     s.enactVaultAssetProposal(),
     s.enactInviteEconCommitteeProposal(),
@@ -472,7 +431,7 @@ test('voters get invitations', async t => {
   await s.startDevNet();
   const purses = await s.provisionMembers();
   await s.startRunPreview();
-  // await s.benefactor.makePool();
+
   await Promise.all([
     s.enactVaultAssetProposal(),
     s.enactInviteEconCommitteeProposal(),
@@ -499,7 +458,7 @@ test('voters get invitations', async t => {
   );
 });
 
-test('assets are in AMM, Vaults', async t => {
+test('assets are in Vaults', async t => {
   const s = await makeScenario(t);
   await s.startDevNet();
   await s.provisionMembers();
@@ -518,11 +477,6 @@ test('assets are in AMM, Vaults', async t => {
   const brand = await E(agoricNames).lookup('brand', 'IbcATOM');
   const runBrand = await E(agoricNames).lookup('brand', Stable.symbol);
 
-  /** @type { ERef<XYKAMMPublicFacet> } */
-  const ammAPI = instanceP.amm.then(i => E(zoe).getPublicFacet(i));
-  const ammStuff = await E(ammAPI).getAllPoolBrands();
-  t.deepEqual(ammStuff, [brand]);
-
   /** @type {ERef<import('../src/vaultFactory/vaultFactory').VaultFactoryContract['publicFacet']>} */
   const vaultsAPI = instanceP.VaultFactory.then(i => E(zoe).getPublicFacet(i));
 
diff --git a/packages/inter-protocol/test/test-interchainPool.js b/packages/inter-protocol/test/test-interchainPool.js
deleted file mode 100644
index 2a512a7f906..00000000000
--- a/packages/inter-protocol/test/test-interchainPool.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import { test as anyTest } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { makeNodeBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { E, Far } from '@endo/far';
-import { makePromiseKit } from '@endo/promise-kit';
-import { startInterchainPool } from '../src/proposals/econ-behaviors.js';
-import { setupAmmServices } from './amm/vpool-xyk-amm/setup.js';
-import { setUpZoeForTest } from './supports.js';
-
-/** @template T @typedef {import('@endo/promise-kit').PromiseKit<T>} PromiseKit */
-
-/** @type {import('ava').TestFn<Awaited<ReturnType<makeTestContext>>>} */
-const test = anyTest;
-
-const contractRoots = {
-  interchainPool: './src/interchainPool.js',
-};
-
-const makeTestContext = async () => {
-  const bundleCache = await makeNodeBundleCache('bundles/', {}, s => import(s));
-  const farZoeKit = await setUpZoeForTest();
-  const { zoe } = farZoeKit;
-
-  const istKit = makeIssuerKit('IST');
-
-  const install = (src, dest) =>
-    bundleCache.load(src, dest).then(b => E(zoe).install(b));
-  const installation = {
-    interchainPool: install(contractRoots.interchainPool, 'interchainPool'),
-  };
-
-  return {
-    bundleCache,
-    zoe: await zoe,
-    farZoeKit,
-    istKit,
-    installation,
-  };
-};
-
-test.before(async t => {
-  t.context = await makeTestContext();
-});
-
-const { keys } = Object;
-
-test('make interchain pool', async t => {
-  const { make, add } = AmountMath;
-  const { farZoeKit, istKit, installation, zoe } = t.context;
-
-  const minimumCentral = make(istKit.brand, 1000n * 1_000_000n);
-
-  // Start AMM
-  const {
-    amm: { ammPublicFacet: ammPub },
-    space,
-  } = await setupAmmServices(t, undefined, istKit, undefined, farZoeKit);
-
-  const bootstrap = async () => {
-    // Mock VBANK / BankManager
-    /** @type {PromiseKit<{ mint: ERef<Mint>, issuer: ERef<Issuer>, brand: Brand}>} */
-    const ibcKitP = makePromiseKit();
-
-    /** @type {BankManager} */
-    const bankManager = Far('mock BankManager', {
-      getAssetSubscription: () => assert.fail('not impl'),
-      getModuleAccountAddress: () => assert.fail('not impl'),
-      getRewardDistributorDepositFacet: () => assert.fail('not impl'),
-      addAsset: async (denom, keyword, proposedName, kit) => {
-        t.log('addAsset', { denom, keyword, issuer: `${kit.issuer}` });
-        t.truthy(kit.mint);
-        ibcKitP.resolve({ ...kit, mint: kit.mint || assert.fail() });
-      },
-      getBankForAddress: () => assert.fail('not impl'),
-    });
-
-    space.produce.bankManager.resolve(bankManager);
-    // space.installation.produce.interchainPool.reset();
-    space.installation.produce.interchainPool.resolve(
-      installation.interchainPool,
-    );
-
-    // Start the contract
-    await startInterchainPool(space);
-    const agoricNames = space.consume.agoricNames;
-    const instance = await E(agoricNames).lookup('instance', 'interchainPool');
-    const publicFacet = E(zoe).getPublicFacet(instance);
-
-    const makeVPurse = value =>
-      ibcKitP.promise.then(async ({ issuer, mint, brand }) => {
-        const amt = make(brand, value);
-        const purse = E(issuer).makeEmptyPurse();
-        const pmt = await E(mint).mintPayment(amt);
-        await E(purse).deposit(pmt);
-        return purse;
-      });
-    return { publicFacet, makeVPurse };
-  };
-  const { publicFacet, makeVPurse } = await bootstrap();
-
-  const checkPayouts = async (seat, amts, issuers) => {
-    const actualPayouts = await E(seat).getPayouts();
-    t.log({ seat, actualPayouts });
-    t.deepEqual(keys(actualPayouts).sort(), keys(amts).sort());
-    for (const kw of keys(amts)) {
-      // eslint-disable-next-line no-await-in-loop
-      const pmt = await actualPayouts[kw];
-      // eslint-disable-next-line no-await-in-loop
-      const actual = await E(issuers[kw]).getAmountOf(pmt);
-      t.deepEqual(actual, amts[kw], `amount mismatch for ${kw}`);
-    }
-  };
-
-  const moneyPants = async purses => {
-    const denom = 'ibc/123';
-    const inv1 = await E(publicFacet).makeInterchainPoolInvitation();
-    const proposal1 = harden({
-      give: { Central: add(minimumCentral, make(istKit.brand, 500n)) },
-    });
-    const centralPmt = await E(purses.ist).withdraw(proposal1.give.Central);
-
-    const seat1 = await E(zoe).offer(
-      inv1,
-      proposal1,
-      harden({ Central: centralPmt }),
-      harden({ denom }),
-    );
-    const { invitation: inv2, issuer: ibcIssuer } = await E(
-      seat1,
-    ).getOfferResult();
-    const ibcBrand = await E(ibcIssuer).getBrand();
-
-    const proposal2 = harden({
-      give: { Secondary: make(ibcBrand, 100n) },
-    });
-    const pmt2 = await E(purses.ibc).withdraw(proposal2.give.Secondary);
-    const seat2 = await E(zoe).offer(
-      inv2,
-      proposal2,
-      harden({ Secondary: pmt2 }),
-    );
-    t.deepEqual(await E(seat2).getOfferResult(), 'Added liquidity.');
-
-    const liquidityIssuer = await E(ammPub).getLiquidityIssuer(ibcBrand);
-    const liqBrand = await E(liquidityIssuer).getBrand();
-
-    await checkPayouts(
-      seat1,
-      { Central: make(istKit.brand, 0n) },
-      { Central: istKit.issuer },
-    );
-
-    await checkPayouts(
-      seat2,
-      {
-        Central: make(istKit.brand, 0n),
-        Secondary: make(ibcBrand, 0n),
-        Liquidity: make(liqBrand, proposal1.give.Central.value - 1000n),
-      },
-      {
-        Central: istKit.issuer,
-        Secondary: ibcIssuer,
-        Liquidity: liquidityIssuer,
-      },
-    );
-  };
-
-  const istPurse = istKit.issuer.makeEmptyPurse();
-  istPurse.deposit(
-    istKit.mint.mintPayment(make(istKit.brand, 10_000n * 1_000_000n)),
-  );
-  await moneyPants({ ist: istPurse, ibc: makeVPurse(1000n) });
-});
diff --git a/packages/inter-protocol/test/test-voPool.js b/packages/inter-protocol/test/test-voPool.js
deleted file mode 100644
index 052cb35c5aa..00000000000
--- a/packages/inter-protocol/test/test-voPool.js
+++ /dev/null
@@ -1,174 +0,0 @@
-import { test } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-// eslint-disable-next-line import/order
-import { runVOTest } from '@agoric/swingset-liveslots/tools/vo-test-harness.js';
-
-import { AmountMath, makeIssuerKit } from '@agoric/ertp';
-import { makeParamManager } from '@agoric/governance';
-import {
-  makeNotifierFromSubscriber,
-  makeStoredPublisherKit,
-} from '@agoric/notifier';
-import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { makeFakeMarshaller } from '@agoric/notifier/tools/testSupports.js';
-import { objectMap } from '@agoric/internal';
-import { setupZCFTest } from '@agoric/zoe/test/unitTests/zcf/setupZcfTest.js';
-import buildManualTimer from '@agoric/zoe/tools/manualTimer.js';
-
-import { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';
-import { makeAmmParams } from '../src/vpool-xyk-amm/params.js';
-import { definePoolKind } from '../src/vpool-xyk-amm/pool.js';
-
-/** @typedef {ReturnType<typeof definePoolKind>} MakePoolMulti */
-/** @typedef {ReturnType<MakePoolMulti>} PoolMulti */
-
-/**
- * @param {ERef<ZoeService>} zoe
- * @param {bigint} poolFeeBP
- * @param {bigint} protocolFeeBP
- * @param {Amount<'nat'>} minInitialLiquidity
- * @param {Invitation} poserInvitation - invitation for the question poser
- */
-const makeAmmParamManager = async (
-  zoe,
-  poolFeeBP,
-  protocolFeeBP,
-  minInitialLiquidity,
-  poserInvitation,
-) => {
-  const initial = objectMap(
-    makeAmmParams(
-      poserInvitation,
-      protocolFeeBP,
-      poolFeeBP,
-      minInitialLiquidity,
-    ),
-    v => [v.type, v.value],
-  );
-  // @ts-expect-error loose
-  return makeParamManager(makeStoredPublisherKit(), initial, zoe);
-};
-
-const voPoolTest = async (t, mutation, postTest) => {
-  /** @type {MakePoolMulti | undefined} */
-  let makePool;
-  const { zoe, zcf } = await setupZCFTest();
-  const invitation = await zcf.makeInvitation(() => {}, 'fake invitation');
-  const { brand: centralBrand, issuer: centralI } = makeIssuerKit('central');
-  const paramManager = await makeAmmParamManager(
-    zoe,
-    25n,
-    5n,
-    AmountMath.make(centralBrand, 100n),
-    invitation,
-  );
-
-  const { brand: secondaryBrand, issuer: secondaryI } =
-    makeIssuerKit('secondary');
-  const quoteIssuerKit = makeIssuerKit('Quotes', 'set');
-  const liquidityZcfMint = await zcf.makeZCFMint('Liquidity');
-  const { zcfSeat: poolSeatP } = zcf.makeEmptySeatKit();
-  const { zcfSeat: protocolSeatP } = zcf.makeEmptySeatKit();
-  const [poolSeat, protocolSeat] = await Promise.all([
-    poolSeatP,
-    protocolSeatP,
-  ]);
-
-  await zcf.saveIssuer(centralI, 'Central');
-  await zcf.saveIssuer(secondaryI, 'Secondary');
-
-  const defineVirtualPoolKind = () => {
-    const timer = buildManualTimer(t.log);
-
-    const paramAccessor = paramManager.readonly();
-
-    const { rootNode } = makeFakeStorageKit('voPoolTest');
-    const marshaller = makeFakeMarshaller();
-
-    /** @type {import('../src/vpool-xyk-amm/multipoolMarketMaker.js').AmmPowers} */
-    const ammPowers = {
-      zcf,
-      // @ts-expect-error test unused
-      secondaryBrandToPool: undefined,
-      // @ts-expect-error test unused
-      secondaryBrandToLiquidityMint: undefined,
-      centralBrand,
-      timer,
-      quoteIssuerKit,
-      // @ts-expect-error TS is confused
-      params: paramAccessor,
-      protocolSeat,
-    };
-
-    return definePoolKind(
-      makeScalarBigMapStore('virtualPool', { durable: true }),
-      ammPowers,
-      rootNode,
-      marshaller,
-    );
-  };
-
-  const state = {};
-  /** @param {PoolMulti} vobj
-   *  @param {'before' | 'after'} phase
-   */
-  const testVPool = async (vobj, phase) => {
-    const { pool, singlePool } = vobj;
-    if (phase === 'before') {
-      state.notifier = pool.getSubscriber();
-      state.toCentralPA = pool.getToCentralPriceAuthority();
-      state.singlePool = pool.getVPool();
-      state.liquidityIssuer = pool.getLiquidityIssuer();
-      await mutation(vobj);
-    } else if (phase === 'after') {
-      const newNotifier = pool.getSubscriber();
-      t.is(state.notifier, newNotifier);
-      t.is(state.toCentralPA, pool.getToCentralPriceAuthority());
-      t.is(state.singlePool, singlePool);
-      t.is(state.liquidityIssuer, pool.getLiquidityIssuer());
-      t.truthy(postTest(vobj));
-    }
-  };
-
-  const prepare = () => {
-    makePool = defineVirtualPoolKind();
-  };
-
-  const makeTestObject = () => {
-    assert(makePool, 'prepare not called');
-    return makePool(liquidityZcfMint, poolSeat, secondaryBrand);
-  };
-
-  await runVOTest(t, prepare, makeTestObject, testVPool);
-};
-
-const noOp = () => {};
-
-test.serial('unchanged', async t => {
-  await voPoolTest(t, noOp, () => true);
-});
-
-test.serial('one update', async t => {
-  /** @type {Notifier<unknown> | undefined} */
-  let notifier;
-  let initialNotifierCount;
-  await voPoolTest(
-    t,
-    /** @param {PoolMulti} vobj */
-    async vobj => {
-      notifier = makeNotifierFromSubscriber(await vobj.pool.getSubscriber());
-      initialNotifierCount = await notifier.getUpdateSince();
-      return vobj.pool.updateState();
-    },
-    async () => {
-      assert(notifier);
-      const notification = await notifier.getUpdateSince();
-      assert(notification.updateCount);
-      t.is(
-        BigInt(notification.updateCount),
-        BigInt(initialNotifierCount) + 1n,
-        `updateCount should increase by one from ${initialNotifierCount}`,
-      );
-    },
-  );
-});
diff --git a/packages/inter-protocol/test/vaultFactory/driver.js b/packages/inter-protocol/test/vaultFactory/driver.js
index 317cc1dbb4a..5fcc077ba1f 100644
--- a/packages/inter-protocol/test/vaultFactory/driver.js
+++ b/packages/inter-protocol/test/vaultFactory/driver.js
@@ -14,7 +14,6 @@ import { E } from '@endo/eventual-send';
 import { deeplyFulfilled } from '@endo/marshal';
 
 import {
-  setupAmm,
   setupReserve,
   startVaultFactory,
 } from '../../src/proposals/econ-behaviors.js';
@@ -48,7 +47,6 @@ const contractRoots = {
   faucet: './test/vaultFactory/faucet.js',
   liquidate: './src/vaultFactory/liquidateIncrementally.js',
   VaultFactory: './src/vaultFactory/vaultFactory.js',
-  amm: './src/vpool-xyk-amm/multipoolMarketMaker.js',
   reserve: './src/reserve/assetReserve.js',
 };
 
@@ -106,12 +104,7 @@ export const makeDriverContext = async () => {
   // objectMap(contractRoots, (root, k) => loader.load(root, k)),
   const bundles = await allValues({
     faucet: bundleCache.load(contractRoots.faucet, 'faucet'),
-    liquidate: bundleCache.load(
-      contractRoots.liquidate,
-      'liquidateIncrementally',
-    ),
     VaultFactory: bundleCache.load(contractRoots.VaultFactory, 'VaultFactory'),
-    amm: bundleCache.load(contractRoots.amm, 'amm'),
     reserve: bundleCache.load(contractRoots.reserve, 'reserve'),
   });
   const installation = objectMap(bundles, bundle => E(zoe).install(bundle));
@@ -137,77 +130,29 @@ export const makeDriverContext = async () => {
 
 /**
  * @param {import('ava').ExecutionContext<DriverContext>} t
- * @param {any} aethLiquidity
- * @param {any} runLiquidity
  */
-const setupAmmAndElectorate = async (t, aethLiquidity, runLiquidity) => {
+const setupElectorate = async t => {
   const {
     zoe,
-    aeth,
     electorateTerms = { committeeName: 'The Cabal', committeeSize: 1 },
     timer,
   } = t.context;
 
   const space = setupBootstrap(t, timer);
-  const { consume, instance } = space;
   installPuppetGovernance(zoe, space.installation.produce);
   // TODO consider using produceInstallations()
-  space.installation.produce.amm.resolve(t.context.installation.amm);
   space.installation.produce.reserve.resolve(t.context.installation.reserve);
   await startEconomicCommittee(space, {
     options: { econCommitteeOptions: electorateTerms },
   });
-  await setupAmm(space, {
-    options: { minInitialPoolLiquidity: 1000n },
-  });
   await setupReserve(space);
 
-  const governorCreatorFacet = E.get(consume.ammKit).governorCreatorFacet;
-  const governorInstance = await instance.consume.ammGovernor;
-  const governorPublicFacet = await E(zoe).getPublicFacet(governorInstance);
-  const governedInstance = E(governorPublicFacet).getGovernedContract();
-
-  /** @type { GovernedPublicFacet<XYKAMMPublicFacet> } */
-  const ammPublicFacet = await E(governorCreatorFacet).getPublicFacet();
-
-  const liquidityIssuer = await E(ammPublicFacet).addIssuer(
-    aeth.issuer,
-    'Aeth',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-
-  const liqProposal = harden({
-    give: {
-      Secondary: aethLiquidity.proposal,
-      Central: runLiquidity.proposal,
-    },
-    want: { Liquidity: AmountMath.makeEmpty(liquidityBrand) },
-  });
-  const liqInvitation = await E(ammPublicFacet).addPoolInvitation();
-
-  const ammLiquiditySeat = await E(zoe).offer(
-    liqInvitation,
-    liqProposal,
-    harden({
-      Secondary: aethLiquidity.payment,
-      Central: runLiquidity.payment,
-    }),
-  );
-
   t.context.puppetGovernors = {
     // @ts-expect-error cast regular governor to puppet
     vaultFactory: E.get(space.consume.vaultFactoryKit).governorCreatorFacet,
   };
 
-  // TODO get the creator directly
-  const newAmm = {
-    ammCreatorFacet: await E.get(consume.ammKit).creatorFacet,
-    ammPublicFacet,
-    instance: governedInstance,
-    ammLiquidity: E(ammLiquiditySeat).getPayout('Liquidity'),
-  };
-
-  return { amm: newAmm, space };
+  return { space };
 };
 
 /**
@@ -243,7 +188,8 @@ const getRunFromFaucet = async (t, amt) => {
 };
 
 /**
- * NOTE: called separately by each test so AMM/zoe/priceAuthority don't interfere
+ * NOTE: called separately by each test so zoe/priceAuthority/etc. don't
+ * interfere.
  *
  * @param {import('ava').ExecutionContext<DriverContext>} t
  * @param {Amount} initialPrice
@@ -263,28 +209,14 @@ const setupServices = async (
     loanTiming,
     minInitialDebt,
     rates,
-    aethInitialLiquidity,
     runInitialLiquidity,
   } = t.context;
   t.context.timer = timer;
 
   const runPayment = await getRunFromFaucet(t, runInitialLiquidity);
   trace(t, 'faucet', { runInitialLiquidity, runPayment });
-  const runLiquidity = {
-    proposal: runInitialLiquidity,
-    payment: runPayment,
-  };
-  const aethLiquidity = {
-    proposal: aethInitialLiquidity,
-    payment: aeth.mint.mintPayment(aethInitialLiquidity),
-  };
-  const { amm: ammKit, space } = await setupAmmAndElectorate(
-    t,
-    aethLiquidity,
-    runLiquidity,
-  );
+  const { space } = await setupElectorate(t);
   const { consume, produce } = space;
-  trace(t, 'amm', { ammKit });
 
   // Cheesy hack for easy use of manual price authority
   const priceAuthority = makeManualPriceAuthority({
@@ -341,7 +273,6 @@ const setupServices = async (
       vfPublic,
       aethVaultManager,
     },
-    ammKit,
     priceAuthority,
   };
 };
@@ -533,27 +464,6 @@ export const makeManagerDriver = async (
         Minted: expectedMinted,
       });
     },
-    sellOnAMM: async (give, want, optStopAfter, expected) => {
-      const swapInvitation = E(
-        services.ammKit.ammPublicFacet,
-      ).makeSwapInvitation();
-      trace(t, 'AMM sell', { give, want, optStopAfter });
-      const offerArgs = optStopAfter
-        ? harden({ stopAfter: optStopAfter })
-        : undefined;
-      currentSeat = await E(zoe).offer(
-        await swapInvitation,
-        harden({ give: { In: give }, want: { Out: want } }),
-        harden({ In: aeth.mint.mintPayment(give) }),
-        offerArgs,
-      );
-      currentOfferResult = await E(currentSeat).getOfferResult();
-      if (expected) {
-        const payouts = await E(currentSeat).getFinalAllocation();
-        trace(t, 'AMM payouts', payouts);
-        t.like(payouts, expected);
-      }
-    },
     /** @param {Amount<'nat'>} p */
     setPrice: p => priceAuthority.setPrice(makeRatioFromAmounts(p, priceBase)),
     /**
@@ -602,13 +512,7 @@ export const makeManagerDriver = async (
       const { reserveCreatorFacet } = t.context;
       const reserveAllocations = await E(reserveCreatorFacet).getAllocations();
 
-      const liquidityIssuer = await E(
-        services.ammKit.ammPublicFacet,
-      ).getLiquidityIssuer(aeth.brand);
-      const liquidityBrand = await E(liquidityIssuer).getBrand();
-
       t.deepEqual(reserveAllocations, {
-        RaEthLiquidity: AmountMath.make(liquidityBrand, liquidityValue),
         Fee: run.make(stableValue),
       });
     },
diff --git a/packages/inter-protocol/test/vaultFactory/faucet.js b/packages/inter-protocol/test/vaultFactory/faucet.js
index d3033d0a5c5..e3a51a7cc9f 100644
--- a/packages/inter-protocol/test/vaultFactory/faucet.js
+++ b/packages/inter-protocol/test/vaultFactory/faucet.js
@@ -2,8 +2,8 @@ import { Far } from '@endo/marshal';
 import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
 
 /**
- * A Faucet providing Minted so we can provide initial liquidity to the AMM so the
- * VaultFactory can reliably liquidate.
+ * A Faucet providing Minted so we can provide initial liquidity where it's
+ * needed.
  *
  * @param {ZCF} zcf
  * @param {{feeMintAccess: FeeMintAccess}} privateArgs
diff --git a/packages/inter-protocol/test/vaultFactory/test-liquidator.js b/packages/inter-protocol/test/vaultFactory/test-liquidator.js
deleted file mode 100644
index 58633ba0446..00000000000
--- a/packages/inter-protocol/test/vaultFactory/test-liquidator.js
+++ /dev/null
@@ -1,304 +0,0 @@
-import '@agoric/zoe/exported.js';
-import { test as unknownTest } from '@agoric/zoe/tools/prepare-test-env-ava.js';
-
-import { ceilMultiplyBy } from '@agoric/zoe/src/contractSupport/index.js';
-import { eventLoopIteration } from '@agoric/zoe/tools/eventLoopIteration.js';
-import { E } from '@endo/eventual-send';
-import { makeTracer } from '@agoric/internal';
-import '../../src/vaultFactory/types.js';
-import {
-  AT_NEXT,
-  makeManagerDriver,
-  makeDriverContext,
-  Phase,
-} from './driver.js';
-
-/** @typedef {import('./driver.js').DriverContext & {
- * }} Context */
-/** @type {import('ava').TestFn<Context>} */
-const test = unknownTest;
-
-const trace = makeTracer('TestLiq', false);
-
-test.before(async t => {
-  t.context = await makeDriverContext();
-  trace(t, 'CONTEXT');
-});
-
-test('price drop', async t => {
-  const { aeth, run, rates } = t.context;
-
-  // When the price falls to 636, the loan will get liquidated. 636 for 900
-  // Aeth is 1.4 each. The loan is 270 RUN. The margin is 1.05, so at 636, 400
-  // Aeth collateral could support a loan of 268.
-  t.context.loanTiming = {
-    chargingPeriod: 2n,
-    recordingPeriod: 10n,
-  };
-
-  const d = await makeManagerDriver(t, run.make(1000n), aeth.make(900n));
-  // Create a loan for 270 RUN with 400 aeth collateral
-  const collateralAmount = aeth.make(400n);
-  const loanAmount = run.make(270n);
-  const dv = await d.makeVaultDriver(collateralAmount, loanAmount);
-  trace(t, 'loan made', loanAmount, dv);
-  const debtAmount = await dv.checkBorrowed(loanAmount, rates.loanFee);
-
-  await dv.notified(Phase.ACTIVE, {
-    debtSnapshot: {
-      debt: debtAmount,
-      interest: run.makeRatio(100n),
-    },
-  });
-  await dv.checkBalance(debtAmount, collateralAmount);
-
-  // small change doesn't cause liquidation
-  await d.setPrice(run.make(677n));
-  trace(t, 'price dropped a little');
-  await d.tick();
-  await dv.notified(Phase.ACTIVE);
-
-  await d.setPrice(run.make(636n));
-  trace(t, 'price dropped enough to liquidate');
-  await dv.notified(Phase.LIQUIDATING, undefined, AT_NEXT);
-
-  // Collateral consumed while liquidating
-  // Debt remains while liquidating
-  await dv.checkBalance(debtAmount, aeth.makeEmpty());
-  const collateralExpected = aeth.make(210n);
-  const debtExpected = run.makeEmpty();
-  await dv.notified(Phase.LIQUIDATED, { locked: collateralExpected }, AT_NEXT);
-  await dv.checkBalance(debtExpected, collateralExpected);
-
-  await d.checkRewards(run.make(14n));
-
-  await dv.close();
-  await dv.notified(Phase.CLOSED, {
-    locked: aeth.makeEmpty(),
-    updateCount: undefined,
-  });
-  await d.checkPayouts(debtExpected, collateralExpected);
-  await dv.checkBalance(debtExpected, aeth.makeEmpty());
-});
-
-test('price falls precipitously', async t => {
-  const { aeth, run, rates } = t.context;
-  t.context.loanTiming = {
-    chargingPeriod: 2n,
-    recordingPeriod: 10n,
-  };
-
-  const d = await makeManagerDriver(t, run.make(2200n), aeth.make(900n));
-  // Create a loan for 370 RUN with 400 aeth collateral
-  const collateralAmount = aeth.make(400n);
-  const loanAmount = run.make(370n);
-  const dv = await d.makeVaultDriver(collateralAmount, loanAmount);
-  trace(t, 'loan made', loanAmount, dv);
-  const debtAmount = await dv.checkBorrowed(loanAmount, rates.loanFee);
-
-  await dv.notified(Phase.ACTIVE, {
-    debtSnapshot: {
-      debt: debtAmount,
-      interest: run.makeRatio(100n),
-    },
-  });
-  await dv.checkBalance(debtAmount, collateralAmount);
-
-  // Sell some aEth to drive the value down
-  await d.sellOnAMM(aeth.make(200n), run.makeEmpty());
-
-  // [2200n, 19180n, 1650n, 150n],
-  await d.setPrice(run.make(19180n));
-  await dv.checkBalance(debtAmount, collateralAmount);
-  await d.tick();
-  await dv.notified(Phase.ACTIVE);
-
-  await d.setPrice(run.make(1650n));
-  await d.tick();
-  await dv.checkBalance(debtAmount, collateralAmount);
-  await dv.notified(Phase.ACTIVE);
-
-  // Drop price a lot
-  await d.setPrice(run.make(150n));
-  await dv.notified(Phase.LIQUIDATING, undefined, AT_NEXT);
-  await dv.checkBalance(debtAmount, aeth.makeEmpty());
-  // was run.make(103n)
-
-  // Collateral consumed while liquidating
-  // Debt remains while liquidating
-  await dv.checkBalance(debtAmount, aeth.makeEmpty());
-  const collateralExpected = aeth.make(141n);
-  const debtExpected = run.makeEmpty();
-  await dv.notified(Phase.LIQUIDATED, { locked: collateralExpected }, AT_NEXT);
-  await dv.checkBalance(debtExpected, collateralExpected);
-
-  await d.checkRewards(run.make(19n));
-
-  await dv.close();
-  await dv.notified(Phase.CLOSED, {
-    locked: aeth.makeEmpty(),
-    updateCount: undefined,
-  });
-  await d.checkPayouts(debtExpected, collateralExpected);
-  await dv.checkBalance(debtExpected, aeth.makeEmpty());
-});
-
-test('update liquidator', async t => {
-  const { aeth, run: debt } = t.context;
-  t.context.runInitialLiquidity = debt.make(500_000_000n);
-  t.context.aethInitialLiquidity = aeth.make(100_000_000n);
-
-  const d = await makeManagerDriver(t, debt.make(500n), aeth.make(100n));
-  const loanAmount = debt.make(300n);
-  const collateralAmount = aeth.make(100n);
-  /* * @type {UserSeat<VaultKit>} */
-  const dv = await d.makeVaultDriver(collateralAmount, loanAmount);
-  const debtAmount = await E(dv.vault()).getCurrentDebt();
-  await dv.checkBalance(debtAmount, collateralAmount);
-
-  let govNotify = await d.managerNotified();
-  const oldLiquidator = govNotify.value.liquidatorInstance;
-  trace(t, 'gov start', oldLiquidator, govNotify);
-  await d.setGovernedParam(
-    'LiquidationTerms',
-    harden({
-      MaxImpactBP: 80n,
-      OracleTolerance: debt.makeRatio(30n),
-      AMMMaxSlippage: debt.makeRatio(30n),
-    }),
-  );
-  await eventLoopIteration();
-  govNotify = await d.managerNotified();
-  const newLiquidator = govNotify.value.liquidatorInstance;
-  t.not(oldLiquidator, newLiquidator);
-
-  // trigger liquidation
-  await d.setPrice(debt.make(300n));
-  await eventLoopIteration();
-  await dv.notified(Phase.LIQUIDATED);
-});
-
-test('liquidate many', async t => {
-  const { aeth, run, rates } = t.context;
-  // When the price falls to 636, the loan will get liquidated. 636 for 900
-  // Aeth is 1.4 each. The loan is 270 RUN. The margin is 1.05, so at 636, 400
-  // Aeth collateral could support a loan of 268.
-
-  const overThreshold = async v => {
-    const debt = await E(v.vault()).getCurrentDebt();
-    return ceilMultiplyBy(
-      ceilMultiplyBy(debt, rates.liquidationMargin),
-      run.makeRatio(300n),
-    );
-  };
-  const d = await makeManagerDriver(t, run.make(1500n), aeth.make(900n));
-  const collateral = aeth.make(300n);
-  const dv0 = await d.makeVaultDriver(collateral, run.make(390n));
-  const dv1 = await d.makeVaultDriver(collateral, run.make(380n));
-  const dv2 = await d.makeVaultDriver(collateral, run.make(370n));
-  const dv3 = await d.makeVaultDriver(collateral, run.make(360n));
-  const dv4 = await d.makeVaultDriver(collateral, run.make(350n));
-  const dv5 = await d.makeVaultDriver(collateral, run.make(340n));
-  const dv6 = await d.makeVaultDriver(collateral, run.make(330n));
-  const dv7 = await d.makeVaultDriver(collateral, run.make(320n));
-  const dv8 = await d.makeVaultDriver(collateral, run.make(310n));
-  const dv9 = await d.makeVaultDriver(collateral, run.make(300n));
-
-  await d.setPrice(await overThreshold(dv1));
-  await eventLoopIteration();
-  await dv0.notified(Phase.LIQUIDATED);
-  await dv1.notified(Phase.ACTIVE);
-  await dv2.notified(Phase.ACTIVE);
-  await dv3.notified(Phase.ACTIVE);
-  await dv4.notified(Phase.ACTIVE);
-  await dv5.notified(Phase.ACTIVE);
-  await dv6.notified(Phase.ACTIVE);
-  await dv7.notified(Phase.ACTIVE);
-  await dv8.notified(Phase.ACTIVE);
-  await dv9.notified(Phase.ACTIVE);
-
-  await d.setPrice(await overThreshold(dv5));
-  await eventLoopIteration();
-  await dv1.notified(Phase.LIQUIDATED);
-  await dv2.notified(Phase.LIQUIDATED);
-  await dv3.notified(Phase.LIQUIDATED);
-  await dv4.notified(Phase.LIQUIDATED);
-  await dv5.notified(Phase.ACTIVE);
-  await dv6.notified(Phase.ACTIVE);
-  await dv7.notified(Phase.ACTIVE);
-  await dv8.notified(Phase.ACTIVE);
-  await dv9.notified(Phase.ACTIVE);
-
-  await d.setPrice(run.make(300n));
-  await eventLoopIteration();
-  await dv5.notified(Phase.LIQUIDATED);
-  await dv6.notified(Phase.LIQUIDATED);
-  await dv7.notified(Phase.LIQUIDATED);
-  await dv8.notified(Phase.LIQUIDATED);
-  await dv9.notified(Phase.LIQUIDATED);
-});
-
-// 1) `give` sells for more than `stopAfter`, and got some of the input back
-test('amm stopAfter - input back', async t => {
-  const { aeth, run } = t.context;
-  const d = await makeManagerDriver(t, run.make(2_199n), aeth.make(999n));
-  const give = aeth.make(100n);
-  const want = run.make(80n);
-  const stopAfter = run.make(100n);
-  const expectedAeth = aeth.make(38n);
-  const expectedRUN = stopAfter;
-  await d.sellOnAMM(give, want, stopAfter, {
-    In: expectedAeth,
-    Out: expectedRUN,
-  });
-});
-
-// 2) `give` wouldn't have sold for `stopAfter`, so sell it all
-test('amm stopAfter - shortfall', async t => {
-  const { aeth, run } = t.context;
-  // uses off-by-one amounts to force rounding errors
-  const d = await makeManagerDriver(t, run.make(2_199n), aeth.make(999n));
-  const give = aeth.make(100n);
-  const want = run.make(80n);
-  // 164 is the most I could get
-  const stopAfter = run.make(180n);
-  const expectedAeth = aeth.makeEmpty();
-  const expectedRUN = run.make(164n);
-  await d.sellOnAMM(give, want, stopAfter, {
-    In: expectedAeth,
-    Out: expectedRUN,
-  });
-});
-
-// 3) wouldn't have sold for enough, so sold everything,
-//    and that still wasn't enough for `want.Out`
-test('amm stopAfter - want too much', async t => {
-  const { aeth, run } = t.context;
-  // uses off-by-one amounts to force rounding errors
-  const d = await makeManagerDriver(t, run.make(2_199n), aeth.make(999n));
-  const give = aeth.make(100n);
-  const want = run.make(170n);
-  const stopAfter = run.make(180n);
-  const expectedAeth = give;
-  const expectedRUN = run.makeEmpty();
-  await d.sellOnAMM(give, want, stopAfter, {
-    In: expectedAeth,
-    Out: expectedRUN,
-  });
-});
-
-test('penalties to reserve', async t => {
-  const { aeth, run } = t.context;
-
-  const d = await makeManagerDriver(t, run.make(1000n), aeth.make(900n));
-  // Create a loan for 270 RUN with 400 aeth collateral
-  const collateralAmount = aeth.make(400n);
-  const loanAmount = run.make(270n);
-  await d.makeVaultDriver(collateralAmount, loanAmount);
-
-  // liquidate
-  d.setPrice(run.make(636n));
-  await eventLoopIteration();
-
-  await d.checkReserveAllocation(1000n, 29n);
-});
diff --git a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js
index f4f6e13646b..c5aca0966a2 100644
--- a/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js
+++ b/packages/inter-protocol/test/vaultFactory/test-vaultFactory.js
@@ -25,7 +25,6 @@ import { deeplyFulfilled } from '@endo/marshal';
 import { calculateCurrentDebt } from '../../src/interest-math.js';
 import { SECONDS_PER_YEAR } from '../../src/interest.js';
 import {
-  setupAmm,
   setupReserve,
   startVaultFactory,
 } from '../../src/proposals/econ-behaviors.js';
@@ -62,9 +61,7 @@ const test = unknownTest;
 
 const contractRoots = {
   faucet: './test/vaultFactory/faucet.js',
-  liquidate: './src/vaultFactory/liquidateMinimum.js',
   VaultFactory: './src/vaultFactory/vaultFactory.js',
-  amm: './src/vpool-xyk-amm/multipoolMarketMaker.js',
   reserve: './src/reserve/assetReserve.js',
 };
 
@@ -116,9 +113,7 @@ test.before(async t => {
   // note that the liquidation might be a different bundle name
   const bundles = await allValues({
     faucet: bundleCache.load(contractRoots.faucet, 'faucet'),
-    liquidate: bundleCache.load(contractRoots.liquidate, 'liquidateMinimum'),
     VaultFactory: bundleCache.load(contractRoots.VaultFactory, 'VaultFactory'),
-    amm: bundleCache.load(contractRoots.amm, 'amm'),
     reserve: bundleCache.load(contractRoots.reserve, 'reserve'),
   });
   const installation = objectMap(bundles, bundle => E(zoe).install(bundle));
@@ -149,77 +144,23 @@ test.before(async t => {
   trace(t, 'CONTEXT');
 });
 
-/**
- * @param {import('ava').ExecutionContext<Context>} t
- * @param {*} aethLiquidity
- * @param {*} runLiquidity
- */
-const setupAmmAndElectorateAndReserve = async (
-  t,
-  aethLiquidity,
-  runLiquidity,
-) => {
+/** @param {import('ava').ExecutionContext<Context>} t */
+const setupElectorateAndReserve = async t => {
   const {
     zoe,
-    aeth,
     electorateTerms = { committeeName: 'The Cabal', committeeSize: 1 },
     timer,
   } = t.context;
 
   const space = setupBootstrap(t, timer);
-  const { consume, instance } = space;
   installPuppetGovernance(zoe, space.installation.produce);
   produceInstallations(space, t.context.installation);
 
   await startEconomicCommittee(space, electorateTerms);
-  await setupAmm(space, {
-    options: { minInitialPoolLiquidity: 300n },
-  });
 
-  // AMM needs the reserve in order to function
   await setupReserve(space);
 
-  const governorCreatorFacet = E.get(consume.ammKit).governorCreatorFacet;
-  const governorInstance = await instance.consume.ammGovernor;
-  const governorPublicFacet = await E(zoe).getPublicFacet(governorInstance);
-  const governedInstance = E(governorPublicFacet).getGovernedContract();
-
-  /** @type { GovernedPublicFacet<XYKAMMPublicFacet> } */
-  const ammPublicFacet = await E(governorCreatorFacet).getPublicFacet();
-
-  const liquidityIssuer = await E(ammPublicFacet).addIssuer(
-    aeth.issuer,
-    'Aeth',
-  );
-  const liquidityBrand = await E(liquidityIssuer).getBrand();
-
-  const liqProposal = harden({
-    give: {
-      Secondary: aethLiquidity.proposal,
-      Central: runLiquidity.proposal,
-    },
-    want: { Liquidity: AmountMath.makeEmpty(liquidityBrand) },
-  });
-  const liqInvitation = await E(ammPublicFacet).addPoolInvitation();
-
-  const ammLiquiditySeat = await E(zoe).offer(
-    liqInvitation,
-    liqProposal,
-    harden({
-      Secondary: aethLiquidity.payment,
-      Central: runLiquidity.payment,
-    }),
-  );
-
-  // TODO get the creator directly
-  const newAmm = {
-    ammCreatorFacet: await E.get(consume.ammKit).creatorFacet,
-    ammPublicFacet,
-    instance: governedInstance,
-    ammLiquidity: E(ammLiquiditySeat).getPayout('Liquidity'),
-  };
-
-  return { amm: newAmm, space };
+  return { space };
 };
 
 /**
@@ -280,7 +221,7 @@ const legacyOfferResult = vaultSeat => {
 };
 
 /**
- * NOTE: called separately by each test so AMM/zoe/priceAuthority don't interfere
+ * NOTE: called separately by each test so zoe/priceAuthority don't interfere
  *
  * @param {import('ava').ExecutionContext<Context>} t
  * @param {Array<NatValue> | Ratio} priceOrList
@@ -297,38 +238,16 @@ const setupServices = async (
   quoteInterval = 1n,
   runInitialLiquidity,
 ) => {
-  const {
-    zoe,
-    run,
-    aeth,
-    loanTiming,
-    minInitialDebt,
-    endorsedUi,
-    rates,
-    aethInitialLiquidity,
-  } = t.context;
+  const { zoe, run, aeth, loanTiming, minInitialDebt, endorsedUi, rates } =
+    t.context;
   t.context.timer = timer;
 
   const runPayment = await getRunFromFaucet(t, runInitialLiquidity);
   trace(t, 'faucet', { runInitialLiquidity, runPayment });
 
-  const runLiquidity = {
-    proposal: harden(run.make(runInitialLiquidity)),
-    payment: runPayment,
-  };
-
-  const aethLiquidity = {
-    proposal: aethInitialLiquidity,
-    payment: aeth.mint.mintPayment(aethInitialLiquidity),
-  };
-  const { amm: ammKit, space } = await setupAmmAndElectorateAndReserve(
-    t,
-    aethLiquidity,
-    runLiquidity,
-  );
+  const { space } = await setupElectorateAndReserve(t);
 
   const { consume, produce } = space;
-  trace(t, 'amm', { ammKit });
 
   const quoteIssuerKit = makeIssuerKit('quote', AssetKind.SET);
   // Cheesy hack for easy use of manual price authority
@@ -420,15 +339,9 @@ const setupServices = async (
     zoe,
     governor: g,
     vaultFactory: v,
-    ammKit,
     runKit: { issuer: run.issuer, brand: run.brand },
     priceAuthority,
     reserveKit,
-    /** @param {Brand<'nat'>} baseBrand */
-    getLiquidityBrand: baseBrand =>
-      E(ammKit.ammPublicFacet)
-        .getLiquidityIssuer(baseBrand)
-        .then(liqIssuer => E(liqIssuer).getBrand()),
   };
 };
 
@@ -447,7 +360,7 @@ test('first', async t => {
     undefined,
     500n,
   );
-  const { vaultFactory, lender, aethVaultManager } = services.vaultFactory;
+  const { vaultFactory, lender } = services.vaultFactory;
   trace(t, 'services', { services, vaultFactory, lender });
 
   // Create a loan for 470 Minted with 1100 aeth collateral
@@ -465,10 +378,7 @@ test('first', async t => {
     }),
   );
 
-  const {
-    vault,
-    publicNotifiers: { vault: vaultNotifier },
-  } = await legacyOfferResult(vaultSeat);
+  const { vault } = await legacyOfferResult(vaultSeat);
   const debtAmount = await E(vault).getCurrentDebt();
   const fee = ceilMultiplyBy(run.make(470n), rates.loanFee);
   t.deepEqual(
@@ -533,22 +443,13 @@ test('first', async t => {
     'received no run',
   );
 
-  await E(aethVaultManager).liquidateAll();
-  const { value: afterLiquidation } = await E(vaultNotifier).getUpdateSince();
-  t.is(afterLiquidation.vaultState, Phase.LIQUIDATED);
-  t.is((await E(vault).getCurrentDebt()).value, 0n, 'debt is paid off');
-  t.deepEqual(
-    await E(vault).getCollateralAmount(),
-    aeth.make(440n),
-    'unused collateral remains after liquidation',
-  );
-
   t.deepEqual(await E(vaultFactory).getRewardAllocation(), {
     Minted: run.make(24n),
   });
 });
 
-test('price drop', async t => {
+// TODO (7047) reinstate when vaults can use auction
+test.skip('price drop', async t => {
   const { zoe, aeth, run, rates } = t.context;
 
   const manualTimer = buildManualTimer(t.log);
@@ -696,7 +597,8 @@ test('price drop', async t => {
   t.deepEqual(await E(vault).getCollateralAmount(), aeth.makeEmpty());
 });
 
-test('price falls precipitously', async t => {
+// TODO (7047) reinstate when vaults can use auction
+test.skip('price falls precipitously', async t => {
   const { zoe, aeth, run, rates } = t.context;
   t.context.loanTiming = {
     chargingPeriod: 2n,
@@ -762,20 +664,6 @@ test('price falls precipitously', async t => {
     'vault holds 400 Collateral',
   );
 
-  // Sell some Eth to drive the value down
-  const swapInvitation = E(services.ammKit.ammPublicFacet).makeSwapInvitation();
-  const proposal = harden({
-    give: { In: aeth.make(200n) },
-    want: { Out: run.makeEmpty() },
-  });
-  await E(zoe).offer(
-    await swapInvitation,
-    proposal,
-    harden({
-      In: aeth.mint.mintPayment(aeth.make(200n)),
-    }),
-  );
-
   const assertDebtIs = async value => {
     const debt = await E(vault).getCurrentDebt();
     t.is(
@@ -1729,7 +1617,9 @@ test('overdeposit', async t => {
 // Both loans will initially be over collateralized 100%. Alice will withdraw
 // enough of the overage that she'll get caught when prices drop. Bob will be
 // charged interest (twice), which will trigger liquidation.
-test('mutable liquidity triggers and interest', async t => {
+
+// TODO (7047) reinstate when vaults can use auction
+test.skip('mutable liquidity triggers and interest', async t => {
   const { zoe, aeth, run, rates: defaultRates } = t.context;
   t.context.aethInitialLiquidity = aeth.make(90_000_000n);
 
@@ -1975,7 +1865,8 @@ test('bad chargingPeriod', async t => {
   );
 });
 
-test('collect fees from loan and AMM', async t => {
+// TODO (7047) reinstate when vaults can use auction
+test.skip('collect fees from loan and AMM', async t => {
   const { zoe, aeth, run, rates } = t.context;
 
   t.context.aethInitialLiquidity = aeth.make(900n);
@@ -2035,34 +1926,10 @@ test('collect fees from loan and AMM', async t => {
     Minted: run.make(24n),
   });
 
-  const amm = services.ammKit.ammPublicFacet;
-  const swapAmount = aeth.make(60000n);
-  const swapSeat = await E(zoe).offer(
-    E(amm).makeSwapInInvitation(),
-    harden({
-      give: { In: swapAmount },
-      want: { Out: run.makeEmpty() },
-    }),
-    harden({
-      In: aeth.mint.mintPayment(swapAmount),
-    }),
-  );
-
-  const payouts = await E(swapSeat).getPayouts();
-  const inAmount = await E(aeth.issuer).getAmountOf(await payouts.In);
-  t.truthy(AmountMath.isGTE(aeth.make(60000n), inAmount));
-  const outAmount = await E(run.issuer).getAmountOf(await payouts.Out);
-  t.truthy(AmountMath.isGTE(outAmount, run.makeEmpty()));
-
-  const feePoolBalance = await E(amm).getProtocolPoolBalance();
   const collectFeesSeat = await E(zoe).offer(
     E(vaultFactory).makeCollectFeesInvitation(),
   );
   await E(collectFeesSeat).getOfferResult();
-  const feePayoutAmount = await E.get(E(collectFeesSeat).getFinalAllocation())
-    .Fee;
-  trace(t, 'Fee', feePoolBalance, feePayoutAmount);
-  t.truthy(AmountMath.isGTE(feePayoutAmount, feePoolBalance.Fee));
 });
 
 test('close loan', async t => {
@@ -2253,7 +2120,9 @@ test('excessive debt on collateral type - debtLimit', async t => {
 // prices drop. Bob will be charged interest (twice), which will trigger
 // liquidation. Alice's withdrawal is precisely gauged so the difference between
 // a floorDivideBy and a ceilingDivideBy will leave her unliquidated.
-test('mutable liquidity sensitivity of triggers and interest', async t => {
+
+// TODO (7047) reinstate when vaults can use auction
+test.skip('mutable liquidity sensitivity of triggers and interest', async t => {
   const { zoe, aeth, run, rates: defaultRates } = t.context;
 
   t.context.loanTiming = {
@@ -2524,7 +2393,8 @@ test('director notifiers', async t => {
   // We could refactor the tests of those allocations to use the data now exposed by a notifier.
 });
 
-test('manager notifiers', async t => {
+// TODO (7047) reinstate when vaults can use auction
+test.skip('manager notifiers', async t => {
   const LOAN1 = 450n;
   const DEBT1 = 473n; // with penalty
   const LOAN2 = 50n;
@@ -2614,7 +2484,6 @@ test('manager notifiers', async t => {
   });
 
   trace('3. Liquidate all (1 loan)');
-  await E(aethVaultManager).liquidateAll();
   let totalProceedsReceived = 474n;
   let totalOverageReceived = totalProceedsReceived - DEBT1;
   await m.assertChange({
@@ -2668,7 +2537,6 @@ test('manager notifiers', async t => {
   m.addDebt(DEBT2);
 
   trace('6. Liquidate all (2 loans)');
-  await E(aethVaultManager).liquidateAll();
   totalProceedsReceived += 54n;
   totalOverageReceived += 54n - DEBT2;
   await m.assertChange({
@@ -2710,7 +2578,6 @@ test('manager notifiers', async t => {
   m.addDebt(DEBT2);
 
   trace('8. Liquidate all');
-  await E(aethVaultManager).liquidateAll();
   totalProceedsReceived += 53n;
   await m.assertChange({
     numLiquidationsCompleted: 4,
@@ -2765,7 +2632,6 @@ test('manager notifiers', async t => {
   trace('10. Liquidate all including interest');
 
   // liquidateAll executes in parallel, allowing the two burns to complete before the proceed calculations begin
-  await E(aethVaultManager).liquidateAll();
   let nextProceeds = 53n;
   totalProceedsReceived += nextProceeds;
   await m.assertChange({
@@ -2878,8 +2744,6 @@ test('governance publisher', async t => {
   } = await directorGovNotifier.getUpdateSince();
   // can't deepEqual because of non-literal objects
   t.is(current.Electorate.type, 'invitation');
-  t.is(current.LiquidationInstall.type, 'installation');
-  t.is(current.LiquidationTerms.type, 'unknown');
   t.is(current.MinInitialDebt.type, 'amount');
   t.is(current.ShortfallInvitation.type, 'invitation');
   t.is(current.EndorsedUI.type, 'string');
diff --git a/packages/vats/src/core/types.js b/packages/vats/src/core/types.js
index 61f4ab056d4..527ef205fad 100644
--- a/packages/vats/src/core/types.js
+++ b/packages/vats/src/core/types.js
@@ -140,13 +140,13 @@
  *     'walletFactory' | 'provisionPool' |
  *     'feeDistributor' |
  *     'contractGovernor' | 'committee' | 'noActionElectorate' | 'binaryVoteCounter' |
- *     'amm' | 'VaultFactory' | 'liquidate' | 'stakeFactory' |
- *     'Pegasus' | 'reserve' | 'psm' | 'econCommitteeCharter' | 'interchainPool' | 'priceAggregator',
+ *     'VaultFactory' | 'liquidate' | 'stakeFactory' |
+ *     'Pegasus' | 'reserve' | 'psm' | 'econCommitteeCharter' | 'priceAggregator',
  *   instance: |
  *     'economicCommittee' | 'feeDistributor' |
- *     'amm' | 'ammGovernor' | 'VaultFactory' | 'VaultFactoryGovernor' |
+ *     'VaultFactory' | 'VaultFactoryGovernor' |
  *     'stakeFactory' | 'stakeFactoryGovernor' |
- *     'econCommitteeCharter' | 'interchainPool' |
+ *     'econCommitteeCharter' |
  *     'walletFactory' | 'provisionPool' |
  *     'Treasury' | 'reserve' | 'reserveGovernor' | 'Pegasus',
  *   oracleBrand:
@@ -172,7 +172,6 @@
  *   installation:{
  *     produce: Record<WellKnownName['installation'], Producer<Installation>>,
  *     consume: Record<WellKnownName['installation'], Promise<Installation<unknown>>> & {
- *       interchainPool: Promise<Installation<import('@agoric/inter-protocol/src/interchainPool.js').start>>,
  *       mintHolder: Promise<Installation<import('@agoric/vats/src/mintHolder.js').prepare>>,
  *       walletFactory: Promise<Installation<import('@agoric/smart-wallet/src/walletFactory.js').start>>,
  *     },
diff --git a/packages/vats/src/core/utils.js b/packages/vats/src/core/utils.js
index 14af5e51652..2161a21c1c8 100644
--- a/packages/vats/src/core/utils.js
+++ b/packages/vats/src/core/utils.js
@@ -46,7 +46,6 @@ export const agoricNamesReserved = harden({
     committee: 'committee electorate',
     noActionElectorate: 'no action electorate',
     binaryVoteCounter: 'binary vote counter',
-    amm: 'Automated Market Maker',
     VaultFactory: 'vault factory',
     feeDistributor: 'fee distributor',
     liquidate: 'liquidate',
@@ -55,13 +54,10 @@ export const agoricNamesReserved = harden({
     reserve: 'collateral reserve',
     psm: 'Parity Stability Module',
     econCommitteeCharter: 'Charter for Econ Governance questions',
-    interchainPool: 'interchainPool',
     priceAggregator: 'simple price aggregator',
   },
   instance: {
     economicCommittee: 'Economic Committee',
-    amm: 'Automated Market Maker',
-    ammGovernor: 'AMM Governor',
     VaultFactory: 'vault factory',
     feeDistributor: 'fee distributor',
     Treasury: 'Treasury', // for compatibility
@@ -69,10 +65,9 @@ export const agoricNamesReserved = harden({
     stakeFactory: 'stakeFactory',
     stakeFactoryGovernor: 'stakeFactory governor',
     Pegasus: 'remote peg',
-    reserve: 'collateal reserve',
+    reserve: 'collateral reserve',
     reserveGovernor: 'ReserveGovernor',
     econCommitteeCharter: 'Charter for Econ Governance questions',
-    interchainPool: 'interchainPool',
     provisionPool: 'Account Provision Pool',
     walletFactory: 'Smart Wallet Factory',
   },
diff --git a/packages/zoe/docs/zoe-catalog-of-storage.md b/packages/zoe/docs/zoe-catalog-of-storage.md
index 0e1f08034c5..25916bf3eae 100644
--- a/packages/zoe/docs/zoe-catalog-of-storage.md
+++ b/packages/zoe/docs/zoe-catalog-of-storage.md
@@ -121,8 +121,7 @@ vat.)
 
 **Expected cardinality**: one entry per issuer per contract. On the testnet with
 only the bootstrap and load generation code running, this should be
-about 5-10 entries for each instance at most (the AMM has the most
-issuers by far).
+about 5-10 entries for each instance at most.
 
 **Access patterns**: `init`, `get`
 
@@ -137,8 +136,7 @@ vat.)
 
 **Expected cardinality**: one entry per issuer per contract. On the testnet with
 only the bootstrap and load generation code running, this should be
-about 5-10 entries for each instance at most (the AMM has the most
-issuers by far).
+about 5-10 entries for each instance at most.
 
 **Access patterns**: `init`, `has`, `get`
 
diff --git a/packages/zoe/src/contracts/loan/index.js b/packages/zoe/src/contracts/loan/index.js
index d5e4913677c..caa76ed5ee4 100644
--- a/packages/zoe/src/contracts/loan/index.js
+++ b/packages/zoe/src/contracts/loan/index.js
@@ -32,7 +32,7 @@ import { makeLendInvitation } from './lend.js';
  *  * priceAuthority - will be used for getting the current value of
  *    collateral and setting liquidation triggers.
  *  * autoswapInstance - The running contract instance for an Autoswap
- *    or constant product AMM installation. The publicFacet of the
+ *    installation. The publicFacet of the
  *    instance is used for producing an invitation to sell the
  *    collateral on liquidation.
  *  * periodNotifier - the Notifier that provides notifications that
diff --git a/packages/zoe/src/contracts/loan/types.js b/packages/zoe/src/contracts/loan/types.js
index 12d74ace390..04ecc7199fb 100644
--- a/packages/zoe/src/contracts/loan/types.js
+++ b/packages/zoe/src/contracts/loan/types.js
@@ -10,8 +10,8 @@
 
 /**
  * @typedef {Instance} AutoswapInstance
- *   The running contract instance for an Autoswap or constant product
- *   AMM installation.  The publicFacet from the Autoswap
+ *   The running contract instance for an Autoswap installation.  The
+ *   publicFacet from the Autoswap
  *   instance is used for producing an invitation to sell the
  *   collateral on liquidation.
  */