diff --git a/Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js b/Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js
index 5896361b9..06888f342 100644
--- a/Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js
+++ b/Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js
@@ -80,7 +80,7 @@
         if (keyCode === keys.DELETE ||
             (keyCode === keys.D && eventData.event.ctrlKey === true)) {
 
-            var toolTypes = [ 'lesion', 'nonTarget', 'length'];
+            var toolTypes = [ 'bidirectional', 'nonTarget', 'length', 'crTool', 'unTool', 'exTool'];
             var nearbyToolData = getNearbyToolData(eventData.element, eventData.currentPoints.canvas, toolTypes);
 
             if (!nearbyToolData) {
diff --git a/Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js b/Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
index e4a340d8a..6ff6200bf 100644
--- a/Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
+++ b/Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
@@ -28,10 +28,6 @@ Template.lesionTableTimepointCell.helpers({
             return data.response;
         }
     },
-    isTarget: function() {
-        var lesionData = Template.parentData(1);
-        return lesionData.isTarget;
-    },
 
     isBidirectional: function() {
         var lesionData = Template.parentData(1);
diff --git a/Packages/lesiontracker/lib/activateLesion.js b/Packages/lesiontracker/lib/activateLesion.js
index 0eb08436e..ae9e00399 100644
--- a/Packages/lesiontracker/lib/activateLesion.js
+++ b/Packages/lesiontracker/lib/activateLesion.js
@@ -25,7 +25,7 @@ activateLesion = function(measurementId, templateData) {
         sort: {
             latestDate: 1
         }
-    })
+    });
 
     // Loop through each timepoint and populate the orderTimepointEntries array with
     // The measurement data at each timepoint. The most recent measurements will be first in
@@ -58,9 +58,11 @@ activateLesion = function(measurementId, templateData) {
         // Stop if we run out of timepoints before viewports
         if (viewportIndex >= orderedTimepointEntries.length) {
             // Update the element anyway, to remove any other highlights that are present
-            deactivateAllToolData(element, 'lesion');
+            deactivateAllToolData(element, 'bidirectional');
             deactivateAllToolData(element, 'nonTarget');
-            cornerstone.updateImage(element);
+            deactivateAllToolData(element, 'crTool');
+            deactivateAllToolData(element, 'unTool');
+            deactivateAllToolData(element, 'exTool');
 
             return false;
         }
@@ -79,8 +81,11 @@ activateLesion = function(measurementId, templateData) {
         // If there is no measurement data to display, stop here
         if (!measurementAtTimepoint) {
             // Update the element anyway, to remove any other highlights that are present
-            deactivateAllToolData(element, 'lesion');
+            deactivateAllToolData(element, 'bidirectional');
             deactivateAllToolData(element, 'nonTarget');
+            deactivateAllToolData(element, 'crTool');
+            deactivateAllToolData(element, 'unTool');
+            deactivateAllToolData(element, 'exTool');
             cornerstone.updateImage(element);
             return;
         }
diff --git a/Packages/lesiontracker/lib/activateMeasurements.js b/Packages/lesiontracker/lib/activateMeasurements.js
index b6db4d217..eb0f204a4 100644
--- a/Packages/lesiontracker/lib/activateMeasurements.js
+++ b/Packages/lesiontracker/lib/activateMeasurements.js
@@ -57,7 +57,7 @@ activateMeasurements = function(element, measurementId, templateData, viewportIn
  * @param timepointId
  */
 function activateTool(element, measurementData, timepointId) {
-    deactivateAllToolData(element, 'lesion');
+    deactivateAllToolData(element, 'bidirectional');
     deactivateAllToolData(element, 'nonTarget');
 
     // Deactivate CRUNEX Tools
diff --git a/Packages/lesiontracker/lib/clearTools.js b/Packages/lesiontracker/lib/clearTools.js
index 2c7e6818e..31268f8ba 100644
--- a/Packages/lesiontracker/lib/clearTools.js
+++ b/Packages/lesiontracker/lib/clearTools.js
@@ -1,6 +1,6 @@
 clearTools = function() {
     var patientId = Session.get('patientId');
-    var toolTypes = [ 'lesion', 'nonTarget', 'length', 'ellipticalRoi'];
+    var toolTypes = [ 'bidirectional', 'nonTarget', 'length', 'ellipticalRoi', 'crTool', 'unTool', 'exTool' ];
     var toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.toolState;
     var toolStateKeys = Object.keys(toolState).slice(0);
 
diff --git a/Packages/lesiontracker/lib/handleMeasurementRemoved.js b/Packages/lesiontracker/lib/handleMeasurementRemoved.js
index 425f727b0..340087b9e 100644
--- a/Packages/lesiontracker/lib/handleMeasurementRemoved.js
+++ b/Packages/lesiontracker/lib/handleMeasurementRemoved.js
@@ -3,7 +3,10 @@ handleMeasurementRemoved = function(e, eventData) {
 
     switch (eventData.toolType) {
         case 'nonTarget':
-        case 'lesion':
+        case 'bidirectional':
+        case 'crTool':
+        case 'unTool':
+        case 'exTool':
             log.info('CornerstoneToolsMeasurementRemoved');
 
             var measurement = Measurements.findOne(measurementData.id, {
diff --git a/Packages/lesiontracker/lib/toggleLesionTrackerTools.js b/Packages/lesiontracker/lib/toggleLesionTrackerTools.js
index 119df2124..859a42978 100644
--- a/Packages/lesiontracker/lib/toggleLesionTrackerTools.js
+++ b/Packages/lesiontracker/lib/toggleLesionTrackerTools.js
@@ -18,7 +18,7 @@ toggleLesionTrackerTools = function() {
             activate: [ 'deleteLesionKeyboardTool' ],
             deactivate: [],
             enable: [],
-            disable: [ 'lesion', 'nonTarget', 'scaleOverlayTool', 'length' ]
+            disable: [ 'bidirectional', 'nonTarget', 'scaleOverlayTool', 'length', 'crTool', 'unTool', 'exTool' ]
         };
 
         toolManager.setToolDefaultStates(toolDefaultStates);