diff --git a/.clang-format b/.clang-format
index 465b02578..659a85935 100644
--- a/.clang-format
+++ b/.clang-format
@@ -21,17 +21,17 @@ AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true
 BinPackParameters: false
 BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: true
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: true
-    AfterObjCDeclaration: true
-    AfterStruct: true
-    AfterUnion: true
-    BeforeCatch: true
-    BeforeElse: true
-    IndentBraces: false
+  AfterClass: true
+  AfterControlStatement: true
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct: true
+  AfterUnion: true
+  BeforeCatch: true
+  BeforeElse: true
+  IndentBraces: false
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
@@ -39,7 +39,7 @@ BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
 #BreakStringLiterals
 ColumnLimit: 80
-CommentPragmas: ''
+CommentPragmas: ""
 CompactNamespaces: false
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
diff --git a/src/geode/model/representation/core/detail/transfer_meshes.cpp b/src/geode/model/representation/core/detail/transfer_meshes.cpp
index bbb0108e5..e180d601b 100644
--- a/src/geode/model/representation/core/detail/transfer_meshes.cpp
+++ b/src/geode/model/representation/core/detail/transfer_meshes.cpp
@@ -146,6 +146,7 @@ namespace
                 other, other_corner.mesh().nb_vertices(),
                 other_corner.component_id() );
             const auto& corner = model.corner( corner_id );
+            other_builder.unregister_mesh_component( other_corner );
             builder.update_corner_mesh(
                 corner, other_builder.steal_corner_mesh( other_corner_id ) );
             auto mesh_builder = builder.corner_mesh_builder( corner_id );
@@ -175,6 +176,7 @@ namespace
             const auto line_unique_vertices = save_mesh_unique_vertices( other,
                 other_line.mesh().nb_vertices(), other_line.component_id() );
             const auto& line = model.line( line_id );
+            other_builder.unregister_mesh_component( other_line );
             builder.update_line_mesh(
                 line, other_builder.steal_line_mesh( other_line_id ) );
             auto mesh_builder = builder.line_mesh_builder( line_id );
@@ -205,6 +207,7 @@ namespace
                 other, other_surface.mesh().nb_vertices(),
                 other_surface.component_id() );
             const auto& surface = model.surface( surface_id );
+            other_builder.unregister_mesh_component( other_surface );
             builder.update_surface_mesh(
                 surface, other_builder.steal_surface_mesh( other_surface_id ) );
             auto mesh_builder = builder.surface_mesh_builder( surface_id );
@@ -234,6 +237,7 @@ namespace
             const auto block_unique_vertices = save_mesh_unique_vertices( other,
                 other_block.mesh().nb_vertices(), other_block.component_id() );
             const auto& block = model.block( block_id );
+            other_builder.unregister_mesh_component( other_block );
             builder.update_block_mesh(
                 block, other_builder.steal_block_mesh( other_block_id ) );
             auto mesh_builder = builder.block_mesh_builder( block_id );