diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 828fd75a78..2da4abc242 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1586,7 +1586,7 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) {
         codeColorBuffer[bytesInCode + RED_INDEX  ] = node->getColor()[RED_INDEX  ];
         codeColorBuffer[bytesInCode + GREEN_INDEX] = node->getColor()[GREEN_INDEX];
         codeColorBuffer[bytesInCode + BLUE_INDEX ] = node->getColor()[BLUE_INDEX ];
-        
+
         args->app->_voxelEditSender.queueVoxelEditMessage(PACKET_TYPE_SET_VOXEL_DESTRUCTIVE, codeColorBuffer, codeAndColorLength);
         
         delete[] codeColorBuffer;
diff --git a/interface/src/VoxelEditPacketSender.cpp b/interface/src/VoxelEditPacketSender.cpp
index 5155619b7e..c663977268 100644
--- a/interface/src/VoxelEditPacketSender.cpp
+++ b/interface/src/VoxelEditPacketSender.cpp
@@ -39,7 +39,6 @@ void VoxelEditPacketSender::sendVoxelEditMessage(PACKET_TYPE type, VoxelDetail&
 }
 
 void VoxelEditPacketSender::actuallySendMessage(uint16_t nodeID, unsigned char* bufferOut, ssize_t sizeOut) {
-    qDebug("VoxelEditPacketSender::actuallySendMessage() sizeOut=%lu target NodeID=%d\n", sizeOut, nodeID);
     NodeList* nodeList = NodeList::getInstance();
     for (NodeList::iterator node = nodeList->begin(); node != nodeList->end(); node++) {
         // only send to the NodeTypes that are NODE_TYPE_VOXEL_SERVER
@@ -65,13 +64,7 @@ void VoxelEditPacketSender::queueVoxelEditMessage(PACKET_TYPE type, unsigned cha
             // here we need to get the "pending packet" for this server
             uint16_t nodeID = node->getNodeID();
             const JurisdictionMap& map = _app->_voxelServerJurisdictions[nodeID];
-            
             if (map.isMyJurisdiction(codeColorBuffer, CHECK_NODE_ONLY) == JurisdictionMap::WITHIN) {
-
-                // do I need this???            
-                //if (_pendingEditPackets.find(nodeID) == _pendingEditPackets.end()) {
-                //    _pendingEditPackets[nodeID] = 
-                //}
                 EditPacketBuffer& packetBuffer = _pendingEditPackets[nodeID];
                 packetBuffer._nodeID = nodeID;
             
diff --git a/libraries/voxels/src/JurisdictionMap.cpp b/libraries/voxels/src/JurisdictionMap.cpp
index a89d12fa6b..5573bdf840 100644
--- a/libraries/voxels/src/JurisdictionMap.cpp
+++ b/libraries/voxels/src/JurisdictionMap.cpp
@@ -138,7 +138,7 @@ void JurisdictionMap::init(unsigned char* rootOctalCode, const std::vector<unsig
 
 JurisdictionMap::Area JurisdictionMap::isMyJurisdiction(unsigned char* nodeOctalCode, int childIndex) const {
     // to be in our jurisdiction, we must be under the root...
-    
+
     // if the node is an ancestor of my root, then we return ABOVE
     if (isAncestorOf(nodeOctalCode, _rootOctalCode)) {
         return ABOVE;
@@ -146,12 +146,6 @@ JurisdictionMap::Area JurisdictionMap::isMyJurisdiction(unsigned char* nodeOctal
     
     // otherwise...
     bool isInJurisdiction = isAncestorOf(_rootOctalCode, nodeOctalCode, childIndex);
-
-    //printf("isInJurisdiction=%s rootOctalCode=",debug::valueOf(isInJurisdiction));
-    //printOctalCode(_rootOctalCode);
-    //printf("nodeOctalCode=");
-    //printOctalCode(nodeOctalCode);
-    
     // if we're under the root, then we can't be under any of the endpoints
     if (isInJurisdiction) {
         for (int i = 0; i < _endNodes.size(); i++) {
@@ -162,7 +156,6 @@ JurisdictionMap::Area JurisdictionMap::isMyJurisdiction(unsigned char* nodeOctal
             }
         }
     }
-
     return isInJurisdiction ? WITHIN : BELOW;
 }
 
diff --git a/libraries/voxels/src/VoxelSceneStats.cpp b/libraries/voxels/src/VoxelSceneStats.cpp
index 47e0beafba..02027a5ee4 100644
--- a/libraries/voxels/src/VoxelSceneStats.cpp
+++ b/libraries/voxels/src/VoxelSceneStats.cpp
@@ -439,16 +439,16 @@ int VoxelSceneStats::unpackFromMessage(unsigned char* sourceBuffer, int availabl
 
     if (bytes == 0) {
         _jurisdictionRoot = NULL;
+        _jurisdictionEndNodes.clear();
     } else {
         _jurisdictionRoot = new unsigned char[bytes];
         memcpy(_jurisdictionRoot, sourceBuffer, bytes);
         sourceBuffer += bytes;
-
         // if and only if there's a root jurisdiction, also include the end nodes
+        _jurisdictionEndNodes.clear();
         int endNodeCount = 0;
         memcpy(&endNodeCount, sourceBuffer, sizeof(endNodeCount));
         sourceBuffer += sizeof(endNodeCount);
-
         for (int i=0; i < endNodeCount; i++) {
             int bytes = 0;
             memcpy(&bytes, sourceBuffer, sizeof(bytes));