diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp
index f1a1e5ebf1..754d579b2a 100644
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@@ -418,18 +418,15 @@ QString ModelEntityItem::getAnimationSettings() const {
 
 
 bool ModelEntityItem::isReadyToComputeShape() {
-    // qDebug() << "    ModelEntityItem::getReadyToComputeShape for " << getID().toString() << _collisionModelURL;
     if (_collisionModelURL == "") {
         return true;
     }
 
-    // qDebug() << "    url is" << _collisionModelURL;
     if (! _collisionNetworkGeometry.isNull() && _collisionNetworkGeometry->isLoadedWithTextures()) {
         return true;
     }
 
     if (_collisionNetworkGeometry.isNull()) {
-        // qDebug() << "        _collisionNetworkGeometry is Null";
         _collisionNetworkGeometry =
             DependencyManager::get<GeometryCache>()->getGeometry(_collisionModelURL, QUrl(), false);
 
@@ -442,14 +439,7 @@ bool ModelEntityItem::isReadyToComputeShape() {
     return false;
 }
 
-// void ModelEntityItem::collisionGeometryLoaded() {
-//     qDebug() << "ModelEntityItem::collisionGeometryLoaded for " << getID().toString();
-//     emit entityShapeReady(getID());
-// }
-
 void ModelEntityItem::computeShapeInfo(ShapeInfo& info) {
-    // qDebug() << "ModelEntityItem::computeShapeInfo for " << getID().toString();
-
     if (_collisionModelURL == "") {
         info.setParams(getShapeType(), 0.5f * getDimensions());
     } else {
@@ -461,7 +451,6 @@ void ModelEntityItem::computeShapeInfo(ShapeInfo& info) {
         }
 
         info.setParams(getShapeType(), 0.5f * getDimensions(), NULL, _collisionModelURL);
-        // info.setConvexHull(QVector<glm::vec3>(_points));
         info.setConvexHull(_points);
     }
 }
diff --git a/libraries/entities/src/ModelEntityItem.h b/libraries/entities/src/ModelEntityItem.h
index f296697692..7e047a3658 100644
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@@ -136,9 +136,6 @@ public:
     static void cleanupLoadedAnimations();
 
     bool isReadyToComputeShape();
-
-    // public slots:
-    // void collisionGeometryLoaded();
     
 protected:
 
diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 8397a69ba7..31619d9845 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -96,13 +96,6 @@ void PhysicsEngine::addEntityInternal(EntityItem* entity) {
     }
 }
 
-// void PhysicsEngine::entityShapeReady(QUuid entityId) {
-//     qDebug() << "PhysicsEngine::entityShapeReady for" << entityId.toString() << "thread-id" << QThread::currentThreadId();
-//     lockBusyForWrite();
-//     _busyComputingShape[entityId] = false;
-//     unlockBusy();
-// }
-
 void PhysicsEngine::removeEntityInternal(EntityItem* entity) {
     assert(entity);
     void* physicsInfo = entity->getPhysicsInfo();
diff --git a/libraries/physics/src/ShapeInfoUtil.cpp b/libraries/physics/src/ShapeInfoUtil.cpp
index bdfcf59fc1..116be984b9 100644
--- a/libraries/physics/src/ShapeInfoUtil.cpp
+++ b/libraries/physics/src/ShapeInfoUtil.cpp
@@ -93,20 +93,20 @@ btCollisionShape* ShapeInfoUtil::createShapeFromInfo(const ShapeInfo& info) {
     switch(info.getType()) {
         case SHAPE_TYPE_BOX: {
             shape = new btBoxShape(glmToBullet(info.getHalfExtents()));
-            break;
         }
+        break;
         case SHAPE_TYPE_SPHERE: {
             float radius = info.getHalfExtents().x;
             shape = new btSphereShape(radius);
-            break;
         }
+        break;
         case SHAPE_TYPE_CAPSULE_Y: {
             glm::vec3 halfExtents = info.getHalfExtents();
             float radius = halfExtents.x;
             float height = 2.0f * halfExtents.y;
             shape = new btCapsuleShape(radius, height);
-            break;
         }
+        break;
         case SHAPE_TYPE_CONVEX_HULL: {
             shape = new btConvexHullShape();
             const QVector<glm::vec3>& points = info.getPoints();
@@ -114,8 +114,8 @@ btCollisionShape* ShapeInfoUtil::createShapeFromInfo(const ShapeInfo& info) {
                 btVector3 btPoint(point[0], point[1], point[2]);
                 static_cast<btConvexHullShape*>(shape)->addPoint(btPoint);
             }
-            break;
         }
+        break;
     }
     return shape;
 }
diff --git a/libraries/shared/src/ShapeInfo.cpp b/libraries/shared/src/ShapeInfo.cpp
index bd5436ac5c..29747d77c7 100644
--- a/libraries/shared/src/ShapeInfo.cpp
+++ b/libraries/shared/src/ShapeInfo.cpp
@@ -50,13 +50,6 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QVector<
     _externalData = data;
 }
 
-
-void ShapeInfo::collisionGeometryLoaded() {
-    _type = SHAPE_TYPE_CONVEX_HULL;
-    // xxx copy points over;
-}
-
-
 void ShapeInfo::setBox(const glm::vec3& halfExtents) {
     _type = SHAPE_TYPE_BOX;
     _halfExtents = halfExtents;
diff --git a/libraries/shared/src/ShapeInfo.h b/libraries/shared/src/ShapeInfo.h
index cce1a508a0..75efc97ca2 100644
--- a/libraries/shared/src/ShapeInfo.h
+++ b/libraries/shared/src/ShapeInfo.h
@@ -65,11 +65,6 @@ public:
 
     const DoubleHashKey& getHash() const;
 
-
-private slots:
-    void collisionGeometryLoaded();
-
-
 protected:
     ShapeType _type = SHAPE_TYPE_NONE;
     glm::vec3 _halfExtents = glm::vec3(0.0f);