diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt
index fd15a273ac5..82697c3a762 100644
--- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt
+++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/run.kt
@@ -16,8 +16,6 @@
 
 package org.jetbrains.kotlin.serialization.builtins
 
-import com.intellij.util.concurrency.AppExecutorUtil
-import com.intellij.util.concurrency.AppScheduledExecutorService
 import java.io.File
 
 fun main(args: Array<String>) {
@@ -43,13 +41,7 @@ found top-level declarations to <destination dir> (*.kotlin_builtins files)"""
     val missing = srcDirs.filterNot(File::exists)
     assert(missing.isEmpty()) { "These source directories are missing: $missing" }
 
-    try {
-        BuiltInsSerializer(dependOnOldBuiltIns = false).serialize(destDir, srcDirs, listOf()) { totalSize, totalFiles ->
-            println("Total bytes written: $totalSize to $totalFiles files")
-        }
-    }
-    finally {
-        val service = AppExecutorUtil.getAppScheduledExecutorService() as AppScheduledExecutorService
-        service.shutdownAppScheduledExecutorService()
+    BuiltInsSerializer(dependOnOldBuiltIns = false).serialize(destDir, srcDirs, listOf()) { totalSize, totalFiles ->
+        println("Total bytes written: $totalSize to $totalFiles files")
     }
 }
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
index daaec63a969..a3cf9d99bb7 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
@@ -20,8 +20,6 @@ import com.google.common.base.Predicates;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.util.concurrency.AppExecutorUtil;
-import com.intellij.util.concurrency.AppScheduledExecutorService;
 import kotlin.collections.ArraysKt;
 import kotlin.jvm.functions.Function1;
 import org.fusesource.jansi.AnsiConsole;
@@ -379,16 +377,9 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
         // We depend on swing (indirectly through PSI or something), so we want to declare headless mode,
         // to avoid accidentally starting the UI thread
         System.setProperty("java.awt.headless", "true");
-        try {
-            ExitCode exitCode = doMainNoExit(compiler, args);
-
-            if (exitCode != OK) {
-                System.exit(exitCode.getCode());
-            }
-        }
-        finally {
-            AppScheduledExecutorService service = (AppScheduledExecutorService) AppExecutorUtil.getAppScheduledExecutorService();
-            service.shutdownAppScheduledExecutorService();
+        ExitCode exitCode = doMainNoExit(compiler, args);
+        if (exitCode != OK) {
+            System.exit(exitCode.getCode());
         }
     }
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index 299b5d89757..96ff84af8b7 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -105,7 +105,6 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
 import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
 import org.jetbrains.kotlin.utils.PathUtil
 import java.io.File
-import java.lang.IllegalStateException
 import java.util.*
 
 class KotlinCoreEnvironment private constructor(
diff --git a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt
index dae64dce390..b49863d0c22 100644
--- a/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt
+++ b/compiler/conditional-preprocessor/src/org.jetbrains.kotlin.preprocessor/PreprocessorCLI.kt
@@ -16,9 +16,9 @@
 @file:JvmName("PreprocessorCLI")
 package org.jetbrains.kotlin.preprocessor
 
-import com.intellij.util.concurrency.AppExecutorUtil
-import com.intellij.util.concurrency.AppScheduledExecutorService
 import java.io.File
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
 
 fun main(args: Array<String>) {
     if (args.size != 3) {
@@ -32,12 +32,5 @@ fun main(args: Array<String>) {
     val profile = createProfile(args[2], targetPath)
 
     println("Preprocessing sources in $sourcePath to $targetPath with profile ${profile.name}")
-
-    try {
-        Preprocessor().processSources(sourcePath, profile)
-    }
-    finally {
-        val service = AppExecutorUtil.getAppScheduledExecutorService() as AppScheduledExecutorService
-        service.shutdownAppScheduledExecutorService()
-    }
+    Preprocessor().processSources(sourcePath, profile)
 }