diff --git a/proposals/paymentapps/payment-apps.html b/proposals/paymentapps/payment-apps.html
index 024ce03..8d29531 100644
--- a/proposals/paymentapps/payment-apps.html
+++ b/proposals/paymentapps/payment-apps.html
@@ -3,9 +3,8 @@
 <head>
   <title>Payment App API</title>
     <meta charset='utf-8'>
-    <script src='https://www.w3.org/Tools/respec/respec-w3c-common'
-            async class='remove'>
-    </script>
+    <script src='https://www.w3.org/Tools/respec/respec-w3c-common' class='remove'></script>
+    <script src='utils.js' class='remove'></script>
     <script class='remove'>
         var respecConfig = {
             shortName:  "payment-apps",
@@ -133,7 +132,7 @@ <h2>Introduction</h2>
         <dt><dfn>Conforming user agent</dfn></dt>
         <dd>
             <p>
-                A <dfn data-lt="user agents">user agent</dfn> MUST behave as described in this specification
+                A <a>user agent</a> MUST behave as described in this specification
                 in order to be considered conformant. In this specification, <a>user agent</a> means a <em>Web
                 browser or other interactive user agent</em> as defined in [[!HTML5]].
             </p>
@@ -167,15 +166,19 @@ <h3>Dependencies</h3>
 	    is defined by the Payment Request Architecture document
         [[PAYMENT-ARCH]].</dd>
         -->
+        <!--
         <dt>Payment Request API</dt>
         <dd>The terms <dfn>Payment Request API</dfn>,
             <dfn>PaymentRequest</dfn> and <dfn>PaymentResponse</dfn> are defined by the
             Payment Request API specification [[!PAYMENT-REQUEST-API]].</dd>
+        -->
+        <!--
         <dt>Payment Method Identifiers</dt>
         <dd>The terms <dfn data-lt="payment method|payment methods">payment method</dfn> and
             <dfn data-lt="payment method identifier|payment method identifiers">payment
             method identifier</dfn> are defined by the Payment Method
             Identifiers specification [[!METHOD-IDENTIFIERS]].</dd>
+        -->
         <dt>HTML5</dt>
         <dd>The terms <dfn>global object</dfn>, <dfn>queue a task</dfn>,
             <dfn>browsing context</dfn>, and <dfn>top-level browsing
@@ -252,16 +255,18 @@ <h3>Dependencies</h3>
 </section>
 <section id="definitions">
   <h2>Definitions</h2>
-    <dl>
-        <dt><dfn id="dfn-payment-app">payment app</dfn></dt>
-        <dd>a payment app is a system that handles payment requests and returns a payment response.</dd>
-    </dl>
+  <div data-include="https://w3c.github.io/webpayments-ig/latest/common/terms.html"
+       data-oninclude="restrictReferences">
+  </div>
+
   <h3>Payment App Implementation Technology</h3>
   <dl>
     <dt><dfn id="dfn-browser-based-payment-app">browser-based payment app</dfn></dt>
-    <dd>a payment app that runs in a user agent.</dd>
+    <dd>a <a>payment app</a> that runs in a <a>browser</a>.</dd>
+
     <dt><dfn id="dfn-headless-payment-app">headless Web payment app</dfn></dt>
     <dd>a payment app that has no user interface.</dd>
+
     <!-- This adds no value
     <dt><dfn id="">web-based payment app</dfn></dt>
     <dd>a payment app that communicates using Web technology (such as HTTP).</dd>
@@ -275,23 +280,46 @@ <h3>Payment App Status</h3>
   <dl>
       <dt><dfn id="dfn-registered-payment-app">registered payment app</dfn></dt>
       <dd>a payment app that is "known" to the user agent for the purposes of the interactions described in this document.</dd>
+
       <div class="note" title="Platform-specific registration">
           This specification defines a registration mechanism. Other registration mechanisms might co-exist with this one
           (e.g., on some platforms there may be a way to register a payment app directly with the operating system).</div>
       <dt><dfn id="dfn-unregistered-payment-app">unregistered payment app</dfn></dt>
       <dd>a payment app that is not known to the user agent, either because it has never been registered, or because it has been unregistered.</dd>
+
+	  <dt><dfn id="dfn-enabled-payment-app">enabled payment app</dfn></dt>
+	  <dd>A <a>registered payment app</a> with at least one <a>enabled
+	  payment method</a>.</dd>
+
+	  <dt><dfn id="dfn-matching-payment-app">matching payment app</dfn></dt>
+	  <dd>An <a>enabled payment app</a> that:
+		<ul>
+		  <li>has at least one <a>enabled payment method</a> that the
+		  <a>payee</a> accepts.</li>
+
+		  <li>is not an <a>ignored payment app</a>.</li>
+		</ul>
+	  </dd>
+
+
       <!--
       <dt><dfn id="">ignored payment app</dfn></dt>
       <dd>a payment app that, per user configuration, the user agent does included in matching computations and does not invoke for payment. A payment app may be ignored for some transactions and not for others.</dd>
       -->
+
       <dt><dfn id="dfn-recommended-payment-app">recommended payment app</dfn></dt>
       <dd>a payment app suggested by the payee or user agent to be registered and used to handle a specific payment request.
           <p class="issue" data-number="112" title="Recommended Payment Apps is still under discussion">
               The Working Group has not yet agreed that the system should support recommended payment apps.
               Inclusion might involve small changes to payment request API.</p>
       </dd>
+
+	  <dt><dfn id="dfn-displayed-payment-app">displayed payment app</dfn></dt>
+	  <dd>A <a>matching payment app</a> or <a>recommended payment app</a> presented by the browser for user selection.</dd>
+
       <dt><dfn id="">selected payment app</dfn></dt>
       <dd>the app selected by the user to make a payment, but not yet invoked.</dd>
+
       <dt><dfn id="">invoked payment app</dfn></dt>
       <dd>the selected payment app that the user agent has invoked (executed) and passed payment app input data.</dd>
   </dl>
@@ -299,9 +327,11 @@ <h3>Payment Options</h3>
   <dl>
       <dt><dfn id="dfn-available-payment-app">available payment option</dfn></dt>
       <dd>a payment option from a registered payment app with at least one enabled payment method.</dd>
+
       <dt><dfn id="">matching payment option</dfn></dt>
       <dd>an available payment option that has at least one enabled payment method accepted by the payee, or a recommended
           payment app with at least one supported payment method accepted by the payee.</dd>
+
       <dt><dfn id="">selectable payment option</dfn></dt>
       <dd>a matching payment option for which information has been displayed by the user agent to facilitate user selection,
           but that has not yet been selected. <strong>Note:</strong> Information about selectable payment apps may be
@@ -312,12 +342,15 @@ <h3>Payment Method Support</h3>
       <dt><dfn id="">supported payment method</dfn></dt>
       <dd>a payment method that a payment app has been designed to support however, this payment method may or may
           not currently be enabled. A payment app may support more than one payment method.</dd>
+
       <dt><dfn id="">unsupported payment method</dfn></dt>
       <dd>a payment method that can noit be enabled by a payment app. Updates to a payment app may cause an
           unsupported payment method to become supported.</dd>
-      <dt><dfn id="">enabled payment method </dfn></dt>
+
+      <dt><dfn id="">enabled payment method</dfn></dt>
       <dd>a payment method that the currently registered payment app is able to handle. The set of enabled payment
           methods for a payment app is either the set or a subset of the supported payment methods.</dd>
+
       <p class="note" title="Supported vs enabled Payment Methods">
           The difference between <strong>supported</strong> and <strong>enabled</strong> payment methods is one of design-time vs runtime consideration.
           A payment app supports all the payment methods it was designed to support however at runtime only a subset
@@ -339,13 +372,13 @@ <h3>Payment App Invocation and Response Data</h3>
     <dt><dfn id="">selected payment option</dfn></dt>
     <dd>the payment option selected by the user to handle the payment request.</dd>
     <dt><dfn id="">payment app request data</dfn></dt>
-    <dd>data provided to the invoked payment app by the user agent to initiate a payment request. This data is a subset
+    <dd>data provided to the <a>invoked payment app</a> by the user agent to initiate a payment request. This data is a subset
         of data input to the Payment Request API.</dd>
     <p class="note" title="JSON serialization">
         The data passed between the user agent and the payment app will serializedas JSON data.
     </p>
     <dt><dfn id="">payment app response data</dfn></dt>
-    <dd>data returned by an invoked payment app to the user agent, typically after payment authorization or other action
+    <dd>data returned by an <a>invoked payment app</a> to the user agent, typically after payment authorization or other action
         taken through the payment app. This data, which will vary according to payment method, is then passed through
         the Payment Request API as the payment response.</dd>
   </dl>
@@ -357,7 +390,7 @@ <h2>Payment App Model and Design Considerations</h2>
     <h3>General Considerations</h3>
     <ul>
       <li>This specification builds on PaymentRequest API.</li>
-      <li>It defines mechanisms that may be used to support both Web-based and native payment apps. However, we anticipate
+      <li>It defines mechanisms that may be used to support both Web-based and <a>native payment apps</a>. However, we anticipate
           that the ecosystem will also include proprietary approaches to some of the functionality defined here
           (e.g., for payment app registration or invocation).</li>
     </ul>
@@ -648,7 +681,7 @@ <h4>Examples of Ordering of Selectable Payment Apps</h4>
   <section>
     <h3>Selection by the User</h3>
     <ul>
-      <li>The user agent  <span class='rfc2119'>MUST</span> enable the user to select any displayed payment app.</li>
+      <li>The user agent  <span class='rfc2119'>MUST</span> enable the user to select any <a>displayed payment app</a>.</li>
       <li>If the user selects an unregistered recommended payment app, the user agent <span class='rfc2119'>SHOULD</span>
           offer the user an opportunity to register it.</li>
     </ul>
diff --git a/proposals/paymentapps/utils.js b/proposals/paymentapps/utils.js
new file mode 100644
index 0000000..7517b87
--- /dev/null
+++ b/proposals/paymentapps/utils.js
@@ -0,0 +1,117 @@
+// We should be able to remove terms that are not actually
+// referenced from the common definitions
+//
+// the termlist is in a block of class "termlist", so make sure that
+// has an ID and put that ID into the termLists array so we can 
+// interrogate all of the included termlists later.
+var termNames = [] ;
+var termLists = [] ;
+var termsReferencedByTerms = [] ;
+
+function restrictReferences(utils, content) {
+    var base = document.createElement("div");
+    base.innerHTML = content;
+
+    // New new logic:
+    //
+    // 1. build a list of all term-internal references
+    // 2. When ready to process, for each reference INTO the terms, 
+    // remove any terms they reference from the termNames array too.
+    $.each(base.querySelectorAll("dfn"), function(i, item) {
+        var $t = $(item) ;
+        var titles = $t.getDfnTitles();
+        var n = $t.makeID("dfn", titles[0]);
+        if (n) {
+            termNames[n] = $t.parent() ;
+        }
+    });
+
+    var $container = $(".termlist",base) ;
+    var containerID = $container.makeID("", "terms") ;
+    termLists.push(containerID) ;
+
+    // add a handler to come in after all the definitions are resolved
+    //
+    // New logic: If the reference is within a 'dl' element of
+    // class 'termlist', and if the target of that reference is
+    // also within a 'dl' element of class 'termlist', then
+    // consider it an internal reference and ignore it.
+
+    return (base.innerHTML);
+}
+
+require(["core/pubsubhub"], function(respecEvents) {
+    "use strict";
+    respecEvents.sub('end', function(message) {
+        if (message == 'core/link-to-dfn') {
+            // all definitions are linked; find any internal references
+            $(".termlist a.internalDFN").each(function() {
+                var $r = $(this);
+                var id = $r.attr('href');
+                var idref = id.replace(/^#/,"") ;
+                if (termNames[idref]) {
+                    // this is a reference to another term
+                    // what is the idref of THIS term?
+                    var $def = $r.closest('dd') ;
+                    if ($def.length) {
+                        var $p = $def.prev('dt').find('dfn') ;
+                        var tid = $p.attr('id') ;
+                        if (tid) {
+                            if (termsReferencedByTerms[tid]) {
+                                termsReferencedByTerms[tid].push(idref);
+                            } else {
+                                termsReferencedByTerms[tid] = [] ;
+                                termsReferencedByTerms[tid].push(idref);
+                            }
+                        }
+                    }
+                }
+            }) ;
+
+            // clearRefs is recursive.  Walk down the tree of 
+            // references to ensure that all references are resolved.
+            var clearRefs = function(theTerm) {
+                if ( termsReferencedByTerms[theTerm] ) {
+                    $.each(termsReferencedByTerms[theTerm], function(i, item) {
+                        if (termNames[item]) {
+                            delete termNames[item];
+                            clearRefs(item);
+                        }
+                    });
+                }
+                // make sure this term doesn't get removed
+                if (termNames[theTerm]) {
+                    delete termNames[theTerm];
+                }
+            };
+           
+            // now termsReferencedByTerms has ALL terms that 
+            // reference other terms, and a list of the 
+            // terms that they reference
+            $("a.internalDFN").each(function () {
+                var $item = $(this) ;
+                var t = $item.attr('href');
+                var r = t.replace(/^#/,"") ;
+                // if the item is outside the term list
+                if ( ! $item.closest('dl.termlist').length ) {
+                    clearRefs(r);
+                }
+            });
+
+            // delete any terms that were not referenced.
+            Object.keys(termNames).forEach(function(term) {
+                var $p = $("#"+term) ;
+                if ($p) {
+                    var tList = $p.getDfnTitles();
+                    $p.parent().next().remove();
+                    $p.remove() ;
+                    tList.forEach(function( item ) {
+                        if (respecConfig.definitionMap[item]) {
+                            delete respecConfig.definitionMap[item];
+                        }
+                    });
+                }
+            });
+        }
+    });
+});
