diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 6bb815a597..85dcd5f6f3 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -778,7 +778,6 @@ var toolBar = (function () {
             selectionDisplay.triggerMapping.enable();
             print("starting tablet in landscape mode");
             tablet.landscape = true;
-            entityIconOverlayManager.setIconsSelectable(null,false);
             // Not sure what the following was meant to accomplish, but it currently causes
             // everybody else to think that Interface has lost focus overall. fogbugzid:558
             // Window.setFocus();
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index a374783b1f..fc4612ae80 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -70,29 +70,6 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
         }
     };
 
-
-    this.setIconsSelectable = function(arrayOfSelectedEntityIDs, isIconsSelectable) {
-        if (arrayOfSelectedEntityIDs === null) {
-            for (var id in entityOverlays) {
-                Overlays.editOverlay(entityOverlays[id], {
-                    ignoreRayIntersection: isIconsSelectable
-                });
-            }
-        } else {
-            for (var id in entityOverlays) {
-                if (arrayOfSelectedEntityIDs.indexOf(id) !== -1) { // in the entityOverlays array and selectable
-                    Overlays.editOverlay(entityOverlays[id], {
-                        ignoreRayIntersection: isIconsSelectable
-                    });
-                } else {
-                    Overlays.editOverlay(entityOverlays[id], {
-                        ignoreRayIntersection: !isIconsSelectable
-                    });
-                }
-            }
-        }
-    };
-
     // Allocate or get an unused overlay
     function getOverlay() {
         var overlay;
@@ -138,9 +115,6 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
                     overlayProperties[key] = customProperties[key];
                 }
             }
-            if(properties.type === 'ParticleEffect' || properties.type === 'Light'){
-                overlayProperties.ignoreRayIntersection = true;
-            }
             Overlays.editOverlay(overlay, overlayProperties);
         }
     }
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index c66f162d41..73b55428f1 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -723,10 +723,6 @@ SelectionDisplay = (function() {
                 return false;
             }
 
-            /*
-            entityIconOverlayManager.setIconsSelectable(SelectionManager.selections, true);
-            */
-
             var hitTool = handleTools[ hitOverlayID ];
             if (hitTool) {
                 activeTool = hitTool;