diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt
index 99c539fad02..4c02a99eaca 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt
@@ -30,10 +30,6 @@ import org.jetbrains.kotlin.idea.search.allScope
 import org.jetbrains.kotlin.utils.addIfNotNull
 
 public object DescriptorToDeclarationUtil {
-    public fun getDeclaration(file: JetFile, descriptor: DeclarationDescriptor): PsiElement? {
-        return getDeclaration(file.getProject(), descriptor)
-    }
-
     public fun getDeclaration(project: Project, descriptor: DeclarationDescriptor): PsiElement? {
         var elements: Collection<PsiElement> = DescriptorToSourceUtils.descriptorToDeclarations(descriptor)
         if (elements.isEmpty()) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java
index 4fec4dc74ab..18461509411 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java
@@ -69,7 +69,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
     ) {
         List<DescriptorClassMember> members = new ArrayList<DescriptorClassMember>();
         for (CallableMemberDescriptor memberDescriptor : missingImplementations) {
-            PsiElement declaration = DescriptorToDeclarationUtil.INSTANCE$.getDeclaration(file, memberDescriptor);
+            PsiElement declaration = DescriptorToDeclarationUtil.INSTANCE$.getDeclaration(file.getProject(), memberDescriptor);
             if (declaration == null) {
                 LOG.error("Can not find declaration for descriptor " + memberDescriptor);
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
index 0cc405bbd97..033b04ce06d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt
@@ -76,7 +76,7 @@ public class CreateCallableFromUsageFix(
             val containers = receiverTypeCandidates
                     .map { candidate ->
                         val descriptor = candidate.theType.getConstructor().getDeclarationDescriptor()
-                        val declaration = DescriptorToDeclarationUtil.getDeclaration(file, descriptor)
+                        val declaration = DescriptorToDeclarationUtil.getDeclaration(project, descriptor)
                         if (declaration is JetClassOrObject || declaration is PsiClass) candidate to declaration else null
                     }
                     .filterNotNull()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index e852f67dc68..69f24ec831f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -83,7 +83,7 @@ public fun JetElement.getInternalReferencesToUpdateOnPackageNameChange(packageNa
     fun processReference(refExpr: JetSimpleNameExpression, bindingContext: BindingContext): UsageInfo? {
         val descriptor = bindingContext[BindingContext.REFERENCE_TARGET, refExpr]?.getImportableDescriptor() ?: return null
 
-        val declaration = DescriptorToDeclarationUtil.getDeclaration(file, descriptor) ?: return null
+        val declaration = DescriptorToDeclarationUtil.getDeclaration(getProject(), descriptor) ?: return null
         if (isAncestor(declaration, false)) return null
 
         val isCallable = descriptor is CallableDescriptor