diff --git a/index.html b/index.html
index f7c4eb84..d34ef8ca 100644
--- a/index.html
+++ b/index.html
@@ -578,6 +578,8 @@ <h2>OpenID Connect</h2>
         </section>
         <section class="informative">
         <h3>Controller Documents</h3>
+    
+        <p class="issue" data-number="160"></p>
 
         <p>
 A <a>controller document</a> is a set of data that specifies one or more
@@ -895,10 +897,7 @@ <h2>Verification Relationships</h2>
 <a>verification method</a> is explicit in the <a>controller document</a>.
 <a>Verification methods</a> that are not associated with a particular
 <a>verification relationship</a> cannot be used for that <a>verification
-relationship</a>. For example, a <a>verification method</a> in the value of
-the `<a>authentication</a>` property cannot be used to engage in
-key agreement protocols with the <a>controller</a> &mdash; the value of the
-`<a>keyAgreement</a>` property needs to be used for that.
+relationship</a>.
           </p>
           <p>
 The <a>controller document</a> does not express revoked keys using a <a>verification
@@ -985,7 +984,7 @@ <h2>Assertion</h2>
             </p>
 
             <dl>
-              <dt><dfn id="defn-assertionMethod">assertionMethod</dfn></dt>
+              <dt>assertionMethod</dt>
               <dd>
 The `assertionMethod` property is OPTIONAL. If present, its
 value MUST be a <a data-cite="INFRA#ordered-set">set</a> of
@@ -1601,8 +1600,7 @@ <h2>Controllers</h2>
     }
   }],
   "authentication": ["#subject-authenticaton"],
-  "assertionMethod": ["#credential-issuance"],
-  "keyAgreement": ["#key-agreement"]
+  "assertionMethod": ["#credential-issuance"]
 }
       </pre>
 
diff --git a/terms.html b/terms.html
index ff08b924..38e771bd 100644
--- a/terms.html
+++ b/terms.html
@@ -19,14 +19,6 @@
   attribute or controls a specific secret.
     </dd>
   
-    <dt><dfn data-lt="cryptosuite">cryptographic suite</dfn></dt>
-    <dd>
-  A specification defining the usage of specific cryptographic primitives in
-  order to achieve a particular security goal. These documents are often used
-  to specify <a>verification methods</a>, digital signature types,
-  their identifiers, and other related properties.
-    </dd>
-  
     <dt><dfn data-lt="decentralized identifiers|DID|DIDs">decentralized identifier</dfn> (DID)</dt>
   
     <dd>