diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
index 29834cb4eaf..4abeecd7275 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
@@ -76,10 +76,6 @@ class CliLightClassGenerationSupport(project: Project) : LightClassGenerationSup
         trace.setKotlinCodeAnalyzer(codeAnalyzer)
     }
 
-    override fun getContextForPackage(files: Collection<KtFile>): LightClassConstructionContext {
-        return LightClassConstructionContext(bindingContext, module)
-    }
-
     override fun getContextForClassOrObject(classOrObject: KtClassOrObject): LightClassConstructionContext {
         //force resolve companion for light class generation
         bindingContext.get(BindingContext.CLASS, classOrObject)?.companionObjectDescriptor
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
index 44df6a0f645..39ca7f76b2f 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
@@ -49,10 +49,6 @@ object PackagePartClassUtils {
             else
                 "_$str"
 
-    @TestOnly
-    @JvmStatic fun getDefaultFileClassFqName(packageFqName: FqName, file: VirtualFile): FqName =
-            getPackagePartFqName(packageFqName, file.name)
-
     @TestOnly
     @JvmStatic fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName =
             getPackagePartFqName(facadeClassFqName.parent(), file.name)
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
index 3a048a92fe6..5f2b3d59fa1 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
@@ -36,9 +36,6 @@ public abstract class LightClassGenerationSupport {
         return ServiceManager.getService(project, LightClassGenerationSupport.class);
     }
 
-    @NotNull
-    public abstract LightClassConstructionContext getContextForPackage(@NotNull Collection<KtFile> files);
-
     @NotNull
     public abstract LightClassConstructionContext getContextForClassOrObject(@NotNull KtClassOrObject classOrObject);
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index ba3a814c922..25e7aec9781 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -54,20 +54,6 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
     private val scopeFileComparator = JavaElementFinder.byClasspathComparator(GlobalSearchScope.allScope(project))
     private val psiManager: PsiManager = PsiManager.getInstance(project)
 
-    override fun getContextForPackage(files: Collection<KtFile>): LightClassConstructionContext {
-        assert(!files.isEmpty()) { "No files in package" }
-
-        return getContextForFiles(files)
-    }
-
-    private fun getContextForFiles(files: Collection<KtFile>): LightClassConstructionContext {
-        val sortedFiles = files.sortedWith(scopeFileComparator)
-        val file = sortedFiles.first()
-        val resolveSession = file.getResolutionFacade().getFrontendService(ResolveSession::class.java)
-        forceResolvePackageDeclarations(files, resolveSession)
-        return LightClassConstructionContext(resolveSession.bindingContext, resolveSession.moduleDescriptor)
-    }
-
     override fun getContextForClassOrObject(classOrObject: KtClassOrObject): LightClassConstructionContext {
         if (classOrObject.isLocal()) {
             return getContextForLocalClassOrObject(classOrObject)
@@ -111,7 +97,11 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
     override fun getContextForFacade(files: Collection<KtFile>): LightClassConstructionContext {
         assert(!files.isEmpty()) { "No files in facade" }
 
-        return getContextForFiles(files)
+        val sortedFiles = files.sortedWith(scopeFileComparator)
+        val file = sortedFiles.first()
+        val resolveSession = file.getResolutionFacade().getFrontendService(ResolveSession::class.java)
+        forceResolvePackageDeclarations(files, resolveSession)
+        return LightClassConstructionContext(resolveSession.bindingContext, resolveSession.moduleDescriptor)
     }
 
     override fun findClassOrObjectDeclarations(fqName: FqName, searchScope: GlobalSearchScope): Collection<KtClassOrObject> {