diff --git a/build/src/OpenSourceCommunityInstallersBuildTarget.kt b/build/src/OpenSourceCommunityInstallersBuildTarget.kt
index 3eb59f4d6a1b..926d3e2a73e6 100644
--- a/build/src/OpenSourceCommunityInstallersBuildTarget.kt
+++ b/build/src/OpenSourceCommunityInstallersBuildTarget.kt
@@ -2,11 +2,14 @@
 import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
-import org.jetbrains.intellij.build.*
+import org.jetbrains.intellij.build.BuildOptions
+import org.jetbrains.intellij.build.CompilationTasks
 import org.jetbrains.intellij.build.TraceManager.spanBuilder
+import org.jetbrains.intellij.build.buildCommunityStandaloneJpsBuilder
+import org.jetbrains.intellij.build.createCommunityBuildContext
 import org.jetbrains.intellij.build.impl.buildDistributions
 
-object OpenSourceCommunityInstallersBuildTarget {
+internal object OpenSourceCommunityInstallersBuildTarget {
   @JvmStatic
   fun main(args: Array<String>) {
     val options = BuildOptions().apply {
@@ -19,7 +22,7 @@ object OpenSourceCommunityInstallersBuildTarget {
 
     runBlocking(Dispatchers.Default) {
       val context = createCommunityBuildContext(options)
-      createBuildTasks(context).compileProjectAndTests(listOf("intellij.platform.jps.build.tests"))
+      CompilationTasks.create(context).compileModules(moduleNames = null, includingTestsInModules = listOf("intellij.platform.jps.build.tests"))
       buildDistributions(context)
       spanBuilder("build standalone JPS").useWithScope {
         buildCommunityStandaloneJpsBuilder(targetDir = context.paths.artifactDir.resolve("jps"), context = context)
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt
index b1c7bf204282..a49c5e64b170 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/BuildTasks.kt
@@ -22,13 +22,5 @@ interface BuildTasks {
    */
   suspend fun buildNonBundledPlugins(mainPluginModules: List<String>)
 
-  fun compileProjectAndTests(includingTestsInModules: List<String>)
-
-  fun compileModules(moduleNames: Collection<String>?, includingTestsInModules: List<String>)
-
-  fun compileModules(moduleNames: Collection<String>?) {
-    compileModules(moduleNames = moduleNames, includingTestsInModules = java.util.List.of())
-  }
-
   suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean)
 }
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt
index fb0e4652594f..7f04854eb2eb 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt
@@ -65,7 +65,6 @@ interface CompilationContext {
 
 interface CompilationTasks {
   companion object {
-    @JvmStatic
     fun create(context: CompilationContext): CompilationTasks = CompilationTasksImpl(context)
   }
 
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt
index 1cd36db7412e..0c5a4c4162ff 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt
@@ -173,9 +173,7 @@ class BuildContextImpl internal constructor(
   }
 
   override val bundledPluginModules: List<String>
-    get() {
-      return bundledPluginModulesForModularLoader ?: productProperties.productLayout.bundledPluginModules
-    }
+    get() = bundledPluginModulesForModularLoader ?: productProperties.productLayout.bundledPluginModules
   
   private val bundledPluginModulesForModularLoader by lazy {
     productProperties.rootModuleForModularLoader?.let { rootModule ->
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt
index ea49955eb00c..73bde8e2c0e3 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt
@@ -85,18 +85,6 @@ internal class BuildTasksImpl(private val context: BuildContextImpl) : BuildTask
     )
   }
 
-  override fun compileProjectAndTests(includingTestsInModules: List<String>) {
-    compileModules(moduleNames = null, includingTestsInModules = includingTestsInModules)
-  }
-
-  override fun compileModules(moduleNames: Collection<String>?, includingTestsInModules: List<String>) {
-    CompilationTasks.create(context).compileModules(moduleNames, includingTestsInModules)
-  }
-
-  override fun compileModules(moduleNames: Collection<String>?) {
-    CompilationTasks.create(context).compileModules(moduleNames)
-  }
-
   override suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean) {
     val currentOs = OsFamily.currentOs
     context.paths.distAllDir = targetDirectory
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/searchableOptions.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/searchableOptions.kt
index 164b6d1a1dd4..fdc915d3b547 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/searchableOptions.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/searchableOptions.kt
@@ -11,7 +11,6 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import org.jetbrains.intellij.build.impl.BundledMavenDownloader
-import org.jetbrains.intellij.build.impl.getLocalizationDir
 import org.jetbrains.intellij.build.productRunner.IntellijProductRunner
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
index 42287da5751d..02ca69d24741 100644
--- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
+++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
@@ -5,7 +5,7 @@ import org.jetbrains.intellij.build.BuildContext
 import org.jetbrains.intellij.build.JetBrainsProductProperties
 import org.jetbrains.intellij.build.TEST_FRAMEWORK_WITH_JAVA_RT
 import org.jetbrains.intellij.build.impl.copyDirWithFileFilter
-import org.jetbrains.intellij.build.impl.zipSourcesOfModules
+import org.jetbrains.intellij.build.zipSourcesOfModules
 import java.nio.file.Path
 import java.util.function.Predicate