diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts
index 55cf56e1958..7ea81df7b37 100644
--- a/compiler/daemon/build.gradle.kts
+++ b/compiler/daemon/build.gradle.kts
@@ -24,15 +24,9 @@ dependencies {
     runtime(project(":kotlin-reflect"))
 
     embedded(project(":daemon-common")) { isTransitive = false }
-    embedded(project(":daemon-common-new")) { isTransitive = false }
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) {
         isTransitive = false
     }
-    compile(commonDep("io.ktor", "ktor-network")) {
-        ktorExcludesForDaemon.forEach { (group, module) ->
-            exclude(group = group, module = module)
-        }
-    }
 }
 
 sourceSets {
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
index d19a6195dd9..428d14d52ca 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt
@@ -76,8 +76,7 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
 
     val compilerClassPath = listOf(
         File(compilerLibDir, "kotlin-compiler.jar"),
-        File(compilerLibDir, "kotlin-daemon.jar"),
-        File(compilerLibDir, "ktor-network-1.0.1.jar")
+        File(compilerLibDir, "kotlin-daemon.jar")
     )
     val scriptRuntimeClassPath = listOf(
         File(compilerLibDir, "kotlin-runtime.jar"),
diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
index f115fd0881c..03724146a1a 100644
--- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
+++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt
@@ -97,9 +97,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
     )
 
     val daemonClientClassPath = listOf(
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client-new.jar"),
-        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar"),
-        File(KotlinIntegrationTestBase.getCompilerLib(), "ktor-network-1.0.1.jar")
+        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-daemon-client.jar"),
+        File(KotlinIntegrationTestBase.getCompilerLib(), "kotlin-compiler.jar")
     )
 
     val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
index 5e684450ffd..ab7f9fbddc8 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt
@@ -99,14 +99,13 @@ interface KotlinPaths {
         ScriptingJvmLib(PathUtil.KOTLIN_SCRIPTING_JVM_NAME),
         CoroutinesCore(PathUtil.KOTLINX_COROUTINES_CORE_NAME),
         KotlinDaemon(PathUtil.KOTLIN_DAEMON_NAME),
-        Ktor(PathUtil.KTOR_NAME),
         MainKts(PathUtil.MAIN_KTS_NAME)
     }
 
     // TODO: Maybe we need separate classpaths for compilers with and without the daemon
     enum class ClassPaths(val contents: List<Jar> = emptyList()) {
         Empty(),
-        Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon, Jar.Ktor),
+        Compiler(Jar.Compiler, Jar.StdLib, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon),
         CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib),
         MainKts(Jar.MainKts, Jar.ScriptRuntime, Jar.StdLib, Jar.Reflect)
         ;
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
index 6ea91f88635..4bdae5d0340 100644
--- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt
@@ -69,7 +69,6 @@ object PathUtil {
     const val KOTLIN_SCRIPTING_JS_NAME = "kotlin-scripting-js"
     const val KOTLIN_SCRIPTING_JS_JAR = "$KOTLIN_SCRIPTING_JS_NAME.jar"
     const val KOTLIN_DAEMON_NAME = "kotlin-daemon"
-    const val KTOR_NAME = "ktor-network-1.0.1"
     const val KOTLIN_DAEMON_JAR = "$KOTLIN_SCRIPTING_JVM_NAME.jar"
     const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME = "kotlin-scripting-compiler"
     const val KOTLIN_SCRIPTING_COMPILER_PLUGIN_JAR = "$KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME.jar"
diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts
index c777a329f2e..15b2a506fd3 100644
--- a/prepare/compiler/build.gradle.kts
+++ b/prepare/compiler/build.gradle.kts
@@ -84,7 +84,8 @@ val distLibraryProjects = listOfNotNull(
     ":kotlin-coroutines-experimental-compat",
     ":kotlin-daemon",
     ":kotlin-daemon-client",
-    ":kotlin-daemon-client-new",
+    // TODO: uncomment when new daemon will be put back into dist
+//    ":kotlin-daemon-client-new",
     ":kotlin-imports-dumper-compiler-plugin",
     ":kotlin-main-kts",
     ":kotlin-preloader",
@@ -148,7 +149,6 @@ dependencies {
         }
 
     libraries(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
-    libraries(commonDep("io.ktor", "ktor-network"))
     libraries(kotlinStdlib("jdk8"))
     if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
         libraries(kotlinStdlib("js", "distLibrary"))