diff --git a/config-models/aether-4.x/files/aether-4.0.0.tree b/config-models/aether-4.x/files/aether-4.0.0.tree
index 03213f6..664e53c 100644
--- a/config-models/aether-4.x/files/aether-4.0.0.tree
+++ b/config-models/aether-4.x/files/aether-4.0.0.tree
@@ -23,9 +23,6 @@
         +--rw id                    connectivity-service-id
         +--rw display-name?         string
         +--rw description?          at:description
-        +--rw spgwc-endpoint?       inet:uri
-        +--rw hss-endpoint?         inet:uri
-        +--rw pcrf-endpoint?        inet:uri
         +--rw core-5g-endpoint?     inet:uri
         +--rw acc-prometheus-url?   inet:uri
 
@@ -63,7 +60,7 @@
      +--rw ip-domain* [id]
         +--rw id               ip-domain-id
         +--rw display-name?    string
-        +--rw dnn?             at:dnn
+        +--rw dnn              at:dnn
         +--rw dns-primary?     inet:ip-address
         +--rw dns-secondary?   inet:ip-address
         +--rw subnet           inet:ipv4-prefix