From 6c8d68afc61ccc917f019664f7bed1b1f6a9d2ff Mon Sep 17 00:00:00 2001
From: Liv Erickson <liv@highfidelity.io>
Date: Fri, 18 May 2018 18:18:42 -0700
Subject: [PATCH] add extra cleanup in delete messages and simulation, as a
 fall back

---
 libraries/entities/src/EntitySimulation.cpp | 1 +
 libraries/entities/src/EntityTree.cpp       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp
index d034ddedbe..ba088cb7fd 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -65,6 +65,7 @@ void EntitySimulation::prepareEntityForDelete(EntityItemPointer entity) {
         removeEntityInternal(entity);
         if (entity->getElement()) {
             _deadEntities.insert(entity);
+            _entityTree->cleanupCloneIDs(entity->getEntityItemID());
         }
     }
 }
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index a36ee4be9d..b698ac6eb8 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1990,6 +1990,7 @@ int EntityTree::processEraseMessage(ReceivedMessage& message, const SharedNodePo
 
                 if (shouldEraseEntity(entityID, sourceNode)) {
                     entityItemIDsToDelete << entityItemID;
+                    cleanupCloneIDs(entityItemID);
                 }
             }
             deleteEntities(entityItemIDsToDelete, true, true);