diff --git a/Mp1.json b/Mp1.json
index ca1b0ab64f81f80d5bed1fab66d82272d74a09f5..fa8d90be0be122b4d671a0c70cfcfe7855a66a48 100644
--- a/Mp1.json
+++ b/Mp1.json
@@ -1313,12 +1313,6 @@
                     "endpoint": {
                       "uris": [
                         "/meMp1/service/EntryPoint"
-                      ],
-                      "addresses": [
-                        {
-                          "host": "192.0.2.0",
-                          "port": 8080
-                        }
                       ]
                     },
                     "security": {
@@ -1417,12 +1411,6 @@
                     "endpoint": {
                       "uris": [
                         "/meMp1/service/EntryPoint"
-                      ],
-                      "addresses": [
-                        {
-                          "host": "192.0.2.0",
-                          "port": 8080
-                        }
                       ]
                     },
                     "security": {
@@ -1553,12 +1541,6 @@
                       "endpoint": {
                         "uris": [
                           "/meMp1/service/EntryPoint"
-                        ],
-                        "addresses": [
-                          {
-                            "host": "192.0.2.0",
-                            "port": 8080
-                          }
                         ]
                       },
                       "security": {
@@ -1661,9 +1643,6 @@
                     "protocol": "HTTP",
                     "version": "2.0",
                     "endpoint": {
-                      "uris": [
-                        "/meMp1/service/EntryPoint"
-                      ],
                       "addresses": [
                         {
                           "host": "192.0.2.0",
@@ -2168,6 +2147,10 @@
     "EndPointInfo.Address": {
       "description": "A IP address and port pair",
       "type": "object",
+      "required": [
+        "host",
+        "port"
+      ],
       "properties": {
         "host": {
           "$ref": "#/definitions/EndPointInfo.Address.Host"
diff --git a/Mp1.yaml b/Mp1.yaml
index 8994287cad71cd43b622026fc81947a4ef5e0930..af82e2a8ab7971f06ee9d66344c83af124d6f7d7 100644
--- a/Mp1.yaml
+++ b/Mp1.yaml
@@ -879,9 +879,6 @@ paths:
                   endpoint:
                     uris:
                       - '/meMp1/service/EntryPoint'
-                    addresses:
-                      - host: '192.0.2.0'
-                        port: 8080
                   security:
                     oAuth2Info:
                       grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -948,9 +945,6 @@ paths:
                   endpoint:
                     uris:
                       - '/meMp1/service/EntryPoint'
-                    addresses:
-                      - host: '192.0.2.0'
-                        port: 8080
                   security:
                     oAuth2Info:
                       grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -1032,9 +1026,6 @@ paths:
                     endpoint:
                       uris:
                         - '/meMp1/service/EntryPoint'
-                      addresses:
-                        - host: '192.0.2.0'
-                          port: 8080
                     security:
                       oAuth2Info:
                         grantTypes: 'OAUTH2_CLIENT_CREDENTIALS'
@@ -1103,8 +1094,6 @@ paths:
                   protocol: 'HTTP'
                   version: '2.0'
                   endpoint:
-                    uris:
-                      - '/meMp1/service/EntryPoint'
                     addresses:
                       - host: '192.0.2.0'
                         port: 8080
@@ -1451,6 +1440,9 @@ definitions:
   EndPointInfo.Address:
     description: A IP address and port pair
     type: object
+    required:
+      - host
+      - port
     properties:
       host:
         $ref: '#/definitions/EndPointInfo.Address.Host'