From 222c3f01eb73716be8a449171a5e6c2e4e2a8ab0 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 17 Mar 2015 14:24:46 -0700
Subject: [PATCH] minor cleanups, diff minimization

---
 libraries/octree/src/Octree.h          | 1 -
 libraries/physics/src/ShapeManager.cpp | 3 +--
 libraries/shared/src/ShapeInfo.cpp     | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/libraries/octree/src/Octree.h b/libraries/octree/src/Octree.h
index e50d12918f..672a3b63d5 100644
--- a/libraries/octree/src/Octree.h
+++ b/libraries/octree/src/Octree.h
@@ -14,7 +14,6 @@
 
 #include <set>
 #include <SimpleMovingAverage.h>
-#include <QThread>
 
 class CoverageMap;
 class ReadBitstreamToTreeParams;
diff --git a/libraries/physics/src/ShapeManager.cpp b/libraries/physics/src/ShapeManager.cpp
index d13224d2a7..513fbfa7a5 100644
--- a/libraries/physics/src/ShapeManager.cpp
+++ b/libraries/physics/src/ShapeManager.cpp
@@ -74,8 +74,7 @@ bool ShapeManager::releaseShape(const DoubleHashKey& key) {
         }
     } else {
         // attempt to remove unmanaged shape
-        // XXX
-        //        assert(false);
+        assert(false);
     }
     return false;
 }
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index 29747d77c7..d92decad2a 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -39,8 +39,6 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QVector<
         }
         case SHAPE_TYPE_CONVEX_HULL:
             _url = QUrl(url);
-            // start download of model which contains collision hulls
-            // _type = SHAPE_TYPE_NONE; // until download is done XXX
             _halfExtents = halfExtents;
             break;
         default: