diff --git a/multi_user/bl_types/bl_object.py b/multi_user/bl_types/bl_object.py
index f9c25d1..c620b55 100644
--- a/multi_user/bl_types/bl_object.py
+++ b/multi_user/bl_types/bl_object.py
@@ -20,15 +20,6 @@ def load_constraints(target, data):
         utils.dump_anything.load(
             target_constraint, data[constraint])
 
-def get_collection_deps(local_id, collection):
-    deps = []
-    for item in collection:
-            attributes = dir(item)
-            for attr in attributes:
-                attr_ref = getattr(item, attr)
-                if attr_ref and isinstance(attr_ref, bpy.types.Object) and attr_ref.uuid != local_id:
-                    deps.append(attr_ref)
-    return deps
 
 class BlObject(BlDatablock):
     def construct(self, data):
@@ -270,15 +261,6 @@ class BlObject(BlDatablock):
         if self.is_library:
             deps.append(self.pointer.library)
 
-        if hasattr(self.pointer, 'modifiers'):
-            deps.extend(get_collection_deps(self.uuid, self.pointer.modifiers))
-
-        if hasattr(self.pointer,'constraints'):
-            deps.extend(get_collection_deps(self.uuid, self.pointer.constraints))
-        
-        if hasattr(self.pointer,'pose') and self.pointer.pose:
-            for b in self.pointer.pose.bones:
-                deps.extend(get_collection_deps(self.uuid, b.constraints))
 
         if self.pointer.instance_type == 'COLLECTION':
             # TODO: uuid based
diff --git a/multi_user/bl_types/bl_scene.py b/multi_user/bl_types/bl_scene.py
index 2b70244..1a44e76 100644
--- a/multi_user/bl_types/bl_scene.py
+++ b/multi_user/bl_types/bl_scene.py
@@ -61,8 +61,10 @@ class BlScene(BlDatablock):
     def resolve(self):
         scene_name = self.data['name']
         
-        self.pointer = bpy.data.scenes.get(scene_name)
-        # self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.objects)
+        self.pointer = utils.find_from_attr('uuid', self.uuid, bpy.data.scenes)
+        if not self.pointer:
+            self.pointer = bpy.data.scenes.get(scene_name)
+       
 
     def resolve_dependencies(self):
         deps = []
diff --git a/multi_user/libs/replication b/multi_user/libs/replication
index f979c6d..b8af140 160000
--- a/multi_user/libs/replication
+++ b/multi_user/libs/replication
@@ -1 +1 @@
-Subproject commit f979c6d081ab7ae9546f23f8984759378b1543ec
+Subproject commit b8af140842bbea186ffa0557bf924e843d6a9980