1 files changed, 2 insertions, 29 deletions
diff --git a/v3po/impl/src/main/yang/v3po-impl.yang b/v3po/impl/src/main/yang/v3po-impl.yang
index c0240cde3..d6fd25199 100644
--- a/v3po/impl/src/main/yang/v3po-impl.yang
+++ b/v3po/impl/src/main/yang/v3po-impl.yang
@@ -54,24 +54,6 @@ module v3po-impl {
                 }
             }
 
-            container reader-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity tapi:honeycomb-reader-registry;
-                    }
-                }
-            }
-
-            container writer-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity tapi:honeycomb-writer-registry;
-                    }
-                }
-            }
-
             container serializer {
                 uses config:service-ref {
                     refine type {
@@ -81,20 +63,11 @@ module v3po-impl {
                 }
             }
 
-            container config-data-tree {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity dapi:honeycomb-modifiable-data-tree;
-                    }
-                }
-            }
-
-            container operational-data-tree {
+            container dom-data-broker {
                 uses config:service-ref {
                     refine type {
                         mandatory true;
-                        config:required-identity dapi:honeycomb-readable-data-tree;
+                        config:required-identity dom:dom-async-data-broker;
                     }
                 }
             }