diff --git a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
index 04a5dde2460d..447eb957a452 100644
--- a/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
@@ -37,7 +37,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
 import com.intellij.util.Query;
-import com.intellij.util.containers.BidirectionalMap;
 import org.jdom.Element;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -56,8 +55,6 @@ public class EmptyMethodInspection extends GlobalJavaBatchInspectionTool {
   private static final String DISPLAY_NAME = InspectionsBundle.message("inspection.empty.method.display.name");
   @NonNls private static final String SHORT_NAME = "EmptyMethod";
 
-  private final BidirectionalMap<Boolean, QuickFix> myQuickFixes = new BidirectionalMap<>();
-
   public final JDOMExternalizableStringList EXCLUDE_ANNOS = new JDOMExternalizableStringList();
   @SuppressWarnings("PublicField")
   public boolean commentsAreContent = false;
@@ -263,21 +260,13 @@ public class EmptyMethodInspection extends GlobalJavaBatchInspectionTool {
   }
 
   private LocalQuickFix getFix(final ProblemDescriptionsProcessor processor, final boolean needToDeleteHierarchy) {
-    QuickFix fix = myQuickFixes.get(needToDeleteHierarchy);
-    if (fix == null) {
-      fix = new DeleteMethodQuickFix(processor, needToDeleteHierarchy);
-      myQuickFixes.put(needToDeleteHierarchy, fix);
-      return (LocalQuickFix)fix;
-    }
-    return (LocalQuickFix)fix;
+    return new DeleteMethodQuickFix(processor, needToDeleteHierarchy);
   }
 
   @Override
   public String getHint(@NotNull final QuickFix fix) {
-    final List<Boolean> list = myQuickFixes.getKeysByValue(fix);
-    if (list != null) {
-      LOG.assertTrue(list.size() == 1);
-      return String.valueOf(list.get(0));
+    if (fix instanceof DeleteMethodQuickFix) {
+      return String.valueOf(((DeleteMethodQuickFix)fix).myNeedToDeleteHierarchy);
     }
     return null;
   }