diff --git a/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImplicitVariableElementInfoFactory.java b/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImplicitVariableElementInfoFactory.java
deleted file mode 100644
index a52f6b467f75..000000000000
--- a/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImplicitVariableElementInfoFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.psi.impl.smartPointers;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Segment;
-import com.intellij.psi.ImplicitVariable;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiIdentifier;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class ImplicitVariableElementInfoFactory extends SmartPointerElementInfoFactory {
-  @Override
-  @Nullable
-  public SmartPointerElementInfo createElementInfo(@NotNull final PsiElement element, @NotNull PsiFile containingFile) {
-    if (element instanceof ImplicitVariable) {
-      return new ImplicitVariableInfo((ImplicitVariable) element, containingFile.getProject());
-    }
-    return null;
-  }
-
-  private static class ImplicitVariableInfo extends HardElementInfo {
-    private ImplicitVariableInfo(@NotNull ImplicitVariable var, @NotNull Project project) {
-      super(project, var);
-    }
-
-    @Override
-    public PsiElement restoreElement() {
-      ImplicitVariable myVar = (ImplicitVariable)super.restoreElement();
-      PsiIdentifier psiIdentifier = myVar.getNameIdentifier();
-      if (psiIdentifier == null || psiIdentifier.isValid()) return myVar;
-      return null;
-    }
-
-    @Override
-    public Segment getRange() {
-      ImplicitVariable myVar = (ImplicitVariable)super.restoreElement();
-      PsiIdentifier psiIdentifier = myVar.getNameIdentifier();
-      if (psiIdentifier == null || !psiIdentifier.isValid()) return null;
-      return psiIdentifier.getTextRange();
-    }
-  }
-}
diff --git a/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImportListElementInfoFactory.java b/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImportListElementInfoFactory.java
deleted file mode 100644
index 2677ec64de8a..000000000000
--- a/java/java-impl/src/com/intellij/psi/impl/smartPointers/ImportListElementInfoFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.psi.impl.smartPointers;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiImportList;
-import com.intellij.psi.PsiJavaFile;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public class ImportListElementInfoFactory extends SmartPointerElementInfoFactory {
-  @Override
-  @Nullable
-  public SmartPointerElementInfo createElementInfo(@NotNull final PsiElement element, @NotNull PsiFile containingFile) {
-    if (element instanceof PsiImportList) {
-      return new ImportListInfo((PsiJavaFile)containingFile);
-    }
-    return null;
-  }
-
-  private static class ImportListInfo extends FileElementInfo {
-    private ImportListInfo(@NotNull PsiJavaFile file) {
-      super(file);
-    }
-
-    @Override
-    public PsiElement restoreElement() {
-      PsiElement element = super.restoreElement();
-      if (!(element instanceof PsiJavaFile)) return null;
-      return ((PsiJavaFile)element).getImportList();
-    }
-  }
-}
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 71d30cc5c02a..5778c0ff46e1 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1220,8 +1220,6 @@
 
     <vcsSelectionProvider implementation="com.intellij.vcsUtil.JavaVcsSelectionProvider"/>
 
-    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImplicitVariableElementInfoFactory"/>
-    <smartPointerElementInfoFactory implementation="com.intellij.psi.impl.smartPointers.ImportListElementInfoFactory"/>
     <smartPointer.anchorProvider implementation="com.intellij.psi.impl.smartPointers.JavaAnchorProvider"/>
 
     <elementSignatureProvider implementation="com.intellij.codeInsight.folding.impl.JavaElementSignatureProvider"/>