diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
index 1b18fede5e3e..b20038e4b474 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java
@@ -563,14 +563,6 @@ public class ClsClassImpl extends ClsMemberImpl<PsiClassStub<?>> implements PsiE
     return PsiClassImplUtil.getClassUseScope(this);
   }
 
-  @Override
-  public PsiQualifiedNamedElement getContainer() {
-    final PsiFile file = getContainingFile();
-    final PsiDirectory dir;
-    return file == null ? null : (dir = file.getContainingDirectory()) == null
-                                 ? null : JavaDirectoryService.getInstance().getPackage(dir);
-  }
-
   @Override
   public void putInfo(@NotNull Map<String, String> info) {
     PsiClassImpl.putInfo(this, info);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
index 24037696a83b..74cbd94abee0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
@@ -421,9 +421,4 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
   public boolean hasModifierProperty(@NonNls @NotNull final String name) {
     return false;
   }
-
-  @Override
-  public PsiQualifiedNamedElement getContainer() {
-    return getParentPackage();
-  }
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
index 9dd9b4b2658c..cb33d967c737 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
@@ -652,14 +652,6 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
     return PsiClassImplUtil.getClassUseScope(this);
   }
 
-  @Override
-  @Nullable
-  public PsiQualifiedNamedElement getContainer() {
-    final PsiFile file = getContainingFile();
-    final PsiDirectory dir = file.getContainingDirectory();
-    return dir == null ? null : JavaDirectoryService.getInstance().getPackage(dir);
-  }
-
   @Override
   public void putInfo(@NotNull Map<String, String> info) {
     putInfo(this, info);
diff --git a/platform/core-api/src/com/intellij/psi/PsiQualifiedNamedElement.java b/platform/core-api/src/com/intellij/psi/PsiQualifiedNamedElement.java
index a7e729a8cce3..6fbbde4e9eff 100644
--- a/platform/core-api/src/com/intellij/psi/PsiQualifiedNamedElement.java
+++ b/platform/core-api/src/com/intellij/psi/PsiQualifiedNamedElement.java
@@ -49,13 +49,4 @@ public interface PsiQualifiedNamedElement extends PsiNamedElement {
   @Nullable
   @NonNls
   String getName();
-
-  /**
-   * Returns container of the element.
-   *
-   * @return container of the element
-   */
-  @Deprecated
-  @Nullable
-  PsiQualifiedNamedElement getContainer();
 }