diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java
index cf7f3c122558..0ea232a56015 100644
--- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java
+++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java
@@ -37,9 +37,7 @@ public class SimpleThreesideDiffChange {
   @NotNull private ConflictType myType;
 
   @NotNull private final List<RangeHighlighter> myHighlighters = new ArrayList<RangeHighlighter>();
-  @NotNull private final List<RangeHighlighter> myActionHighlighters = new ArrayList<RangeHighlighter>();
 
-  private boolean myIsValid = true;
   private int[] myLineStartShifts = new int[3];
   private int[] myLineEndShifts = new int[3];
 
@@ -60,8 +58,6 @@ public class SimpleThreesideDiffChange {
     createHighlighter(ThreeSide.BASE);
     if (myType.isLeftChange()) createHighlighter(ThreeSide.LEFT);
     if (myType.isRightChange()) createHighlighter(ThreeSide.RIGHT);
-
-    doInstallActionHighlighters();
   }
 
   public void destroyHighlighter() {
@@ -69,11 +65,6 @@ public class SimpleThreesideDiffChange {
       highlighter.dispose();
     }
     myHighlighters.clear();
-
-    for (RangeHighlighter highlighter : myActionHighlighters) {
-      highlighter.dispose();
-    }
-    myActionHighlighters.clear();
   }
 
   //
@@ -110,10 +101,6 @@ public class SimpleThreesideDiffChange {
     }
   }
 
-  private void doInstallActionHighlighters() {
-    // TODO
-  }
-
   //
   // Getters
   //
@@ -156,11 +143,6 @@ public class SimpleThreesideDiffChange {
       return false;
     }
 
-    for (RangeHighlighter highlighter : myActionHighlighters) {
-      highlighter.dispose();
-    }
-    myActionHighlighters.clear();
-    myIsValid = false;
     return true;
   }