diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
index b9b8a200a256..8c41a83d20dd 100644
--- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
+++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/smartPointerPsiNodes/BaseSmartPointerPsiNode.java
@@ -131,7 +131,6 @@ public abstract class BaseSmartPointerPsiNode <Type extends SmartPsiElementPoint
   }
 
   protected PsiElement getPsiElement(){
-    final Type value = getValue();
-    return value == null ? null : value.getElement();
+    return (PsiElement)getValue(); // automatically de-anchorized in AbstractTreeNode.getValue
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java
index 98481380905f..abd24dc44498 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiTreeAnchorizer.java
@@ -36,7 +36,7 @@ public class PsiTreeAnchorizer extends TreeAnchorizer {
       PsiElement psi = (PsiElement)element;
       return ReadAction.compute(() -> {
         if (!psi.isValid()) return psi;
-        return new SmartPointerWrapper(SmartPointerManager.getInstance(psi.getProject()).createSmartPsiElementPointer(psi));
+        return SmartPointerManager.getInstance(psi.getProject()).createSmartPsiElementPointer(psi);
       });
     }
     return super.createAnchor(element);
@@ -44,8 +44,8 @@ public class PsiTreeAnchorizer extends TreeAnchorizer {
   @Override
   @Nullable
   public Object retrieveElement(@NotNull final Object pointer) {
-    if (pointer instanceof SmartPointerWrapper) {
-      return ReadAction.compute(() -> ((SmartPointerWrapper)pointer).myPointer.getElement());
+    if (pointer instanceof SmartPsiElementPointer) {
+      return ReadAction.compute(() -> ((SmartPsiElementPointer)pointer).getElement());
     }
 
     return super.retrieveElement(pointer);
@@ -53,9 +53,9 @@ public class PsiTreeAnchorizer extends TreeAnchorizer {
 
   @Override
   public void freeAnchor(final Object element) {
-    if (element instanceof SmartPointerWrapper) {
+    if (element instanceof SmartPsiElementPointer) {
       ApplicationManager.getApplication().runReadAction(() -> {
-        SmartPsiElementPointer pointer = ((SmartPointerWrapper)element).myPointer;
+        SmartPsiElementPointer pointer = (SmartPsiElementPointer)element;
         Project project = pointer.getProject();
         if (!project.isDisposed()) {
           SmartPointerManager.getInstance(project).removePointer(pointer);
@@ -63,29 +63,4 @@ public class PsiTreeAnchorizer extends TreeAnchorizer {
       });
     }
   }
-
-  private static class SmartPointerWrapper {
-    private final SmartPsiElementPointer myPointer;
-
-    private SmartPointerWrapper(@NotNull SmartPsiElementPointer pointer) {
-      myPointer = pointer;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (!(o instanceof SmartPointerWrapper)) return false;
-
-      SmartPointerWrapper wrapper = (SmartPointerWrapper)o;
-
-      if (!myPointer.equals(wrapper.myPointer)) return false;
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return myPointer.hashCode();
-    }
-  }
 }