diff --git a/openapi/resource-server.yaml b/openapi/resource-server.yaml
index 2cc6eea3..4a26c6d0 100644
--- a/openapi/resource-server.yaml
+++ b/openapi/resource-server.yaml
@@ -107,7 +107,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/incoming-payment-with-methods'
+                $ref: '#/components/schemas/incoming-payment'
               examples:
                 New Incoming Payment for $25:
                   value:
@@ -127,10 +127,7 @@ paths:
                       externalRef: INV2022-02-0137
                     createdAt: '2022-03-12T23:20:50.52Z'
                     updatedAt: '2022-04-01T10:24:36.11Z'
-                    methods:
-                      - type: ilp
-                        ilpAddress: g.ilp.iwuyge987y.98y08y
-                        sharedSecret: 1c7eaXa4rd2fFOBl1iydvCT1tV5TbM3RW1WLCafu_JA'401'
+        '401':
           $ref: '#/components/responses/401'
         '403':
           $ref: '#/components/responses/403'
@@ -606,7 +603,7 @@ paths:
             application/json:
               schema:
                 anyOf:
-                  - $ref: '#/components/schemas/incoming-payment-with-methods'
+                  - $ref: '#/components/schemas/incoming-payment'
                   - $ref: '#/components/schemas/public-incoming-payment'
               examples:
                 Incoming Payment for $25 with $12.34 received so far:
@@ -628,10 +625,6 @@ paths:
                     metadata:
                       description: Thanks for the flowers!
                       externalRef: INV-12876
-                    methods:
-                      - type: ilp
-                        ilpAddress: g.ilp.iwuyge987y.98y08y
-                        sharedSecret: 1c7eaXa4rd2fFOBl1iydvCT1tV5TbM3RW1WLCafu_JA
         '401':
           $ref: '#/components/responses/401'
         '403':
@@ -643,11 +636,6 @@ paths:
         - $ref: '#/components/parameters/optional-signature'
       description: A client can fetch the latest state of an incoming payment to determine the amount received into the wallet address.
     parameters:
-      - schema:
-        type: string
-      name: walletAddress
-      in: query
-      required: true
       - $ref: '#/components/parameters/id'
       - $ref: '#/components/parameters/walletAddress'
   '/incoming-payments/{id}/complete':
@@ -748,11 +736,6 @@ paths:
         - $ref: '#/components/parameters/signature-input'
         - $ref: '#/components/parameters/signature'
     parameters:
-      - schema:
-        type: string
-      name: walletAddress
-      in: query
-      required: true
       - $ref: '#/components/parameters/id'
       - $ref: '#/components/parameters/walletAddress'
   '/quotes/{id}':
@@ -933,25 +916,12 @@ components:
         - receivedAmount
         - createdAt
         - updatedAt
-    incoming-payment-with-methods:
-      allOf:
-        - $ref: '#/components/schemas/incoming-payment'
-        - type: object
-          properties:
-            methods:
-              type: array
-              uniqueItems: true
-              minItems: 0
-              items:
-                $ref: '#/components/schemas/ilp-payment-method'
-          required:
-            - methods
     public-incoming-payment:
       title: Public Incoming Payment
       description: An **incoming payment** resource with public details.
       type: object
       examples:
-        - receivedAmount: null
+        - receivedAmount:
           value: '0'
           assetCode: USD
           assetScale: 2
@@ -1198,27 +1168,6 @@ components:
           kty: OKP
           crv: Ed25519
           x: oy0L_vTygNE4IogRyn_F5GmHXdqYVjIXkWs2jky7zsI
-    ilp-payment-method:
-      type: object
-      additionalProperties: false
-      properties:
-        type:
-          type: string
-          enum:
-            - 'ilp'
-        ilpAddress:
-          type: string
-          maxLength: 1023
-          pattern: '^(g|private|example|peer|self|test[1-3]?|local)([.][a-zA-Z0-9_~-]+)+$'
-          description: The ILP address to use when establishing a STREAM connection.
-        sharedSecret:
-          type: string
-          pattern: '^[a-zA-Z0-9-_]+$'
-          description: The base64 url-encoded shared secret to use when establishing a STREAM connection.
-      examples:
-        - type: string
-          ilpAddress: string
-          sharedSecret: string
   securitySchemes:
     GNAP:
       name: Authorization