diff --git a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp
index b5b2ba8885..926c3f1289 100644
--- a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp
@@ -60,6 +60,5 @@ void RenderableBoxEntityItem::render(RenderArgs* args) {
         glPopMatrix();
     glPopMatrix();
 
-    // FIX ME!
-    //RenderableDebugableEntityItem::render(this, args);
+    RenderableDebugableEntityItem::render(this, args);
 };
diff --git a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
index 8450bcc636..017cb289f0 100644
--- a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp
@@ -19,7 +19,7 @@
 #include "RenderableDebugableEntityItem.h"
 
 
-void RenderableDebugableEntityItem::renderBoundingBox(EntityItemPointer entity, RenderArgs* args,
+void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, RenderArgs* args,
                                                       float puffedOut, glm::vec4& color) {
     glm::vec3 position = entity->getPosition();
     glm::vec3 center = entity->getCenter();
@@ -39,7 +39,7 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItemPointer entity,
     glPopMatrix();
 }
 
-void RenderableDebugableEntityItem::renderHoverDot(EntityItemPointer entity, RenderArgs* args) {
+void RenderableDebugableEntityItem::renderHoverDot(EntityItem* entity, RenderArgs* args) {
     glm::vec3 position = entity->getPosition();
     glm::vec3 center = entity->getCenter();
     glm::vec3 dimensions = entity->getDimensions();
@@ -65,7 +65,7 @@ void RenderableDebugableEntityItem::renderHoverDot(EntityItemPointer entity, Ren
     glPopMatrix();
 }
 
-void RenderableDebugableEntityItem::render(EntityItemPointer entity, RenderArgs* args) {
+void RenderableDebugableEntityItem::render(EntityItem* entity, RenderArgs* args) {
     bool debugSimulationOwnership = args->_debugFlags & RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP;
 
     if (debugSimulationOwnership) {
diff --git a/libraries/entities-renderer/src/RenderableDebugableEntityItem.h b/libraries/entities-renderer/src/RenderableDebugableEntityItem.h
index c022a3e33f..758bac353b 100644
--- a/libraries/entities-renderer/src/RenderableDebugableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableDebugableEntityItem.h
@@ -16,9 +16,9 @@
 
 class RenderableDebugableEntityItem {
 public:
-    static void renderBoundingBox(EntityItemPointer entity, RenderArgs* args, float puffedOut, glm::vec4& color);
-    static void renderHoverDot(EntityItemPointer entity, RenderArgs* args);
-    static void render(EntityItemPointer entity, RenderArgs* args);
+    static void renderBoundingBox(EntityItem* entity, RenderArgs* args, float puffedOut, glm::vec4& color);
+    static void renderHoverDot(EntityItem* entity, RenderArgs* args);
+    static void render(EntityItem* entity, RenderArgs* args);
 };
 
 #endif // hifi_RenderableDebugableEntityItem_h
diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
index 72808bec7b..b7dbf2ce2e 100644
--- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp
@@ -38,6 +38,5 @@ void RenderableLineEntityItem::render(RenderArgs* args) {
         DependencyManager::get<DeferredLightingEffect>()->renderLine(p1, p2, lineColor, lineColor);
     glPopMatrix();
     
-    // FIX ME
-    //RenderableDebugableEntityItem::render(this, args);
+    RenderableDebugableEntityItem::render(this, args);
 };
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index de641b4f6e..75b29002f3 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -193,12 +193,10 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
 
     if (!didDraw) {
         glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f);
-        // FIX ME
-        //RenderableDebugableEntityItem::renderBoundingBox(this, args, 0.0f, greenColor);
+        RenderableDebugableEntityItem::renderBoundingBox(this, args, 0.0f, greenColor);
     }
 
-    // FIX ME
-    //RenderableDebugableEntityItem::render(this, args);
+    RenderableDebugableEntityItem::render(this, args);
 }
 
 Model* RenderableModelEntityItem::getModel(EntityTreeRenderer* renderer) {
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index b4520b351a..7d286a3710 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -103,8 +103,7 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(QUuid identit
     if (_entityTree) {
         _entityTree->lockForRead();
 
-        // FIX ME!!
-        EntityItemPointer entity = nullptr; // const_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(EntityItemID(identity)));
+        EntityItemPointer entity = _entityTree->findEntityByEntityItemID(EntityItemID(identity));
         
         if (entity) {
             results = entity->getProperties();
@@ -163,8 +162,7 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
     if (_entityTree) {
         _entityTree->lockForWrite();
 
-        // FIX ME!!
-        EntityItemPointer entity = nullptr; // const_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
+        EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
         if (entity) {
             if (entity->getLocked()) {
                 shouldDelete = false;
diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp
index 97a29572d2..c13ea31063 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -39,15 +39,10 @@ void EntitySimulation::updateEntities() {
 
 void EntitySimulation::getEntitiesToDelete(VectorOfEntities& entitiesToDelete) {
 
-    // FIX ME!!!
-    /*
-    for (auto entityItr : _entitiesToDelete) {
-        EntityItemPointer entity = (*entityItr);
+    for (auto entity : _entitiesToDelete) {
         // this entity is still in its tree, so we insert into the external list
         entitiesToDelete.push_back(entity);
-        ++entityItr;
     }
-     */
     _entitiesToDelete.clear();
 }
 
diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index efdfca11d5..1cc590a59b 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -560,8 +560,7 @@ bool EntityTreeElement::findSpherePenetration(const glm::vec3& center, float rad
         if (findSphereSpherePenetration(center, radius, entityCenter, entityRadius, penetration)) {
             // return true on first valid entity penetration
             
-            // FIX ME!!
-            //*penetratedObject = (void*)(entity);
+            *penetratedObject = (void*)(entity.get());
             
             return true;
         }
@@ -641,7 +640,6 @@ EntityItemPointer EntityTreeElement::getEntityWithEntityItemID(const EntityItemI
 void EntityTreeElement::cleanupEntities() {
     uint16_t numberOfEntities = _entityItems->size();
     for (uint16_t i = 0; i < numberOfEntities; i++) {
-        // FIX ME!!
         EntityItemPointer entity = (*_entityItems)[i];
         entity->_element = NULL;