From e14b4c6ad4b9299f4b52d2da4676c7052ea8c10b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 27 Apr 2015 11:01:48 -0700
Subject: [PATCH] cleanups

---
 libraries/physics/src/PhysicsEngine.cpp | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp
index 6d0c9c878a..27ea816440 100644
--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@@ -467,16 +467,6 @@ void PhysicsEngine::computeCollisionEvents() {
         if (type == CONTACT_EVENT_TYPE_END) {
             ContactMap::iterator iterToDelete = contactItr;
             ++contactItr;
-
-            // const ContactKey& contactKey = (*iterToDelete).first;
-            // const ObjectMotionState* objectMotionStateA = static_cast<ObjectMotionState*>(contactKey._a);
-            // const ObjectMotionState* objectMotionStateB = static_cast<ObjectMotionState*>(contactKey._b);
-            // const btCollisionObject* objectA =
-            //     objectMotionStateA ? static_cast<const btCollisionObject*>(objectMotionStateA->getRigidBody()) : NULL;
-            // const btCollisionObject* objectB =
-            //     objectMotionStateB ? static_cast<const btCollisionObject*>(objectMotionStateB->getRigidBody()) : NULL;
-            // doOwnershipInfection(objectA, objectB);
-
             _contactMap.erase(iterToDelete);
         } else {
             ++contactItr;
@@ -600,17 +590,10 @@ void PhysicsEngine::removeObjectFromBullet(ObjectMotionState* motionState) {
     assert(motionState);
     btRigidBody* body = motionState->getRigidBody();
 
-    // activate this before deleting it so that anything resting on it will begin to fall.
-    //
-    // body->activate();
-    //
-    // motionState->setShouldClaimSimulationOwnership(true);
-    // computeCollisionEvents();
-    //
+    // wake up anything touching this object
     EntityItem* entityItem = motionState ? motionState->getEntity() : NULL;
     bump(entityItem);
 
-
     if (body) {
         const btCollisionShape* shape = body->getCollisionShape();
         _dynamicsWorld->removeRigidBody(body);