diff --git a/libraries/networking/src/PacketHeaders.cpp b/libraries/networking/src/PacketHeaders.cpp
index 2eee540fff..489017788a 100644
--- a/libraries/networking/src/PacketHeaders.cpp
+++ b/libraries/networking/src/PacketHeaders.cpp
@@ -72,7 +72,7 @@ PacketVersion versionForPacketType(PacketType type) {
             return 1;
         case PacketTypeEntityAddOrEdit:
         case PacketTypeEntityData:
-            return VERSION_MODEL_ENTITIES_SUPPORT_SHAPE_TYPE;
+            return VERSION_ENTITIES_USE_METERS;
         case PacketTypeEntityErase:
             return 2;
         case PacketTypeAudioStreamStats:
diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h
index e593955b51..42f28e5e97 100644
--- a/libraries/networking/src/PacketHeaders.h
+++ b/libraries/networking/src/PacketHeaders.h
@@ -128,6 +128,7 @@ const PacketVersion VERSION_ENTITIES_MODELS_HAVE_ANIMATION_SETTINGS = 5;
 const PacketVersion VERSION_ENTITIES_HAVE_USER_DATA = 6;
 const PacketVersion VERSION_ENTITIES_HAS_LAST_SIMULATED_TIME = 7;
 const PacketVersion VERSION_MODEL_ENTITIES_SUPPORT_SHAPE_TYPE = 8;
+const PacketVersion VERSION_ENTITIES_USE_METERS = 9;
 const PacketVersion VERSION_OCTREE_HAS_FILE_BREAKS = 1;
 
 #endif // hifi_PacketHeaders_h
diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp
index a1df449135..2661d85930 100644
--- a/libraries/octree/src/Octree.cpp
+++ b/libraries/octree/src/Octree.cpp
@@ -2083,58 +2083,6 @@ bool Octree::countOctreeElementsOperation(OctreeElement* element, void* extraDat
     return true; // keep going
 }
 
-void Octree::copySubTreeIntoNewTree(OctreeElement* startElement, Octree* destinationTree, bool rebaseToRoot) {
-    OctreeElementBag elementBag;
-    elementBag.insert(startElement);
-    int chopLevels = 0;
-    if (rebaseToRoot) {
-        chopLevels = numberOfThreeBitSectionsInCode(startElement->getOctalCode());
-    }
-
-    EncodeBitstreamParams params(INT_MAX, IGNORE_VIEW_FRUSTUM, WANT_COLOR, NO_EXISTS_BITS, chopLevels);
-    OctreeElementExtraEncodeData extraEncodeData;
-    params.extraEncodeData = &extraEncodeData;
-
-    OctreePacketData packetData;
-
-    while (!elementBag.isEmpty()) {
-        OctreeElement* subTree = elementBag.extract();
-        packetData.reset(); // reset the packet between usage
-        // ask our tree to write a bitsteam
-        encodeTreeBitstream(subTree, &packetData, elementBag, params);
-        // ask destination tree to read the bitstream
-        ReadBitstreamToTreeParams args(WANT_COLOR, NO_EXISTS_BITS);
-        destinationTree->readBitstreamToTree(packetData.getUncompressedData(), packetData.getUncompressedSize(), args);
-    }
-}
-
-void Octree::copyFromTreeIntoSubTree(Octree* sourceTree, OctreeElement* destinationElement) {
-    OctreeElementBag elementBag;
-    // If we were given a specific element, start from there, otherwise start from root
-    elementBag.insert(sourceTree->_rootElement);
-
-    OctreePacketData packetData;
-
-    EncodeBitstreamParams params(INT_MAX, IGNORE_VIEW_FRUSTUM, WANT_COLOR, NO_EXISTS_BITS);
-    OctreeElementExtraEncodeData extraEncodeData;
-    params.extraEncodeData = &extraEncodeData;
-
-    while (!elementBag.isEmpty()) {
-        OctreeElement* subTree = elementBag.extract();
-
-        packetData.reset(); // reset between usage
-
-        // ask our tree to write a bitsteam
-        sourceTree->encodeTreeBitstream(subTree, &packetData, elementBag, params);
-
-        // ask destination tree to read the bitstream
-        bool wantImportProgress = true;
-        ReadBitstreamToTreeParams args(WANT_COLOR, NO_EXISTS_BITS, destinationElement, 
-                                            0, SharedNodePointer(), wantImportProgress);
-        readBitstreamToTree(packetData.getUncompressedData(), packetData.getUncompressedSize(), args);
-    }
-}
-
 void Octree::cancelImport() {
     _stopImport = true;
 }
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 870e18983e..8774ebe55b 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -323,9 +323,6 @@ public:
 
     unsigned long getOctreeElementsCount();
 
-    void copySubTreeIntoNewTree(OctreeElement* startElement, Octree* destinationTree, bool rebaseToRoot);
-    void copyFromTreeIntoSubTree(Octree* sourceTree, OctreeElement* destinationElement);
-
     bool getShouldReaverage() const { return _shouldReaverage; }
 
     void recurseElementWithOperation(OctreeElement* element, RecurseOctreeOperation operation,