diff --git a/assignment-client/src/octree/OctreeQueryNode.cpp b/assignment-client/src/octree/OctreeQueryNode.cpp
index 364cbf33c1..fa844dc0f8 100644
--- a/assignment-client/src/octree/OctreeQueryNode.cpp
+++ b/assignment-client/src/octree/OctreeQueryNode.cpp
@@ -271,10 +271,7 @@ void OctreeQueryNode::dumpOutOfView() {
     int outOfView = 0;
     OctreeElementBag tempBag;
     ViewFrustum viewCopy;
-    {
-        QMutexLocker viewLocker(&_viewMutex);
-        viewCopy = _currentViewFrustum;
-    }
+    copyCurrentViewFrustum(viewCopy);
     while (OctreeElementPointer elementToCheck = elementBag.extract()) {
         if (elementToCheck->isInView(viewCopy)) {
             tempBag.insert(elementToCheck);
diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index 456b086341..2f0ce3b807 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -109,8 +109,6 @@ public:
         OctreeSceneStats* stats = IGNORE_SCENE_STATS,
         JurisdictionMap* jurisdictionMap = IGNORE_JURISDICTION_MAP,
         OctreeElementExtraEncodeData* extraEncodeData = NULL) :
-            viewFrustum(),
-            lastViewFrustum(),
             lastViewFrustumSent(lastViewFrustumSent),
             maxEncodeLevel(maxEncodeLevel),
             maxLevelReached(0),
diff --git a/libraries/octree/src/OctreeRenderer.cpp b/libraries/octree/src/OctreeRenderer.cpp
index c001bdfc35..a81f946680 100644
--- a/libraries/octree/src/OctreeRenderer.cpp
+++ b/libraries/octree/src/OctreeRenderer.cpp
@@ -22,8 +22,7 @@
 
 OctreeRenderer::OctreeRenderer() :
     _tree(NULL),
-    _managedTree(false),
-    _viewFrustum()
+    _managedTree(false)
 {
 }
 
diff --git a/libraries/shared/src/RenderArgs.h b/libraries/shared/src/RenderArgs.h
index 8c66a6a19b..e8f0002fed 100644
--- a/libraries/shared/src/RenderArgs.h
+++ b/libraries/shared/src/RenderArgs.h
@@ -88,7 +88,6 @@ public:
                gpu::Batch* batch = nullptr) :
     _context(context),
     _renderer(renderer),
-    _viewFrustums(),
     _sizeScale(sizeScale),
     _boundaryLevelAdjust(boundaryLevelAdjust),
     _renderMode(renderMode),
diff --git a/libraries/shared/src/ViewFrustum.h b/libraries/shared/src/ViewFrustum.h
index 6d0bdb0fda..48d45ab455 100644
--- a/libraries/shared/src/ViewFrustum.h
+++ b/libraries/shared/src/ViewFrustum.h
@@ -17,8 +17,6 @@
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
 
-//#include <GLMHelpers.h>
-
 #include "AABox.h"
 #include "AACube.h"
 #include "CubeProjectedPolygon.h"