diff --git a/build.gradle.kts b/build.gradle.kts
index 73bc7669d39..5100527aab5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -271,7 +271,6 @@ extra["compilerModules"] = arrayOf(
     ":core:descriptors.runtime",
     ":core:deserialization",
     ":core:util.runtime",
-    ":core:type-system",
     ":compiler:fir:cones",
     ":compiler:fir:resolve",
     ":compiler:fir:fir-serialization",
@@ -288,7 +287,6 @@ extra["compilerModules"] = arrayOf(
 )
 
 extra["compilerModulesForJps"] = listOf(
-    ":core:type-system",
     ":kotlin-build-common",
     ":kotlin-util-io",
     ":kotlin-util-klib",
diff --git a/core/descriptors.common/build.gradle.kts b/core/descriptors.common/build.gradle.kts
index a11d34aff30..6a1dc2f0d39 100644
--- a/core/descriptors.common/build.gradle.kts
+++ b/core/descriptors.common/build.gradle.kts
@@ -8,7 +8,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
     compile(project(":core:util.runtime"))
-    compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
 }
diff --git a/core/type-system/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt b/core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
similarity index 100%
rename from core/type-system/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
diff --git a/core/type-system/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt b/core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
similarity index 100%
rename from core/type-system/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
diff --git a/core/type-system/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt b/core/descriptors.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
similarity index 100%
rename from core/type-system/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
diff --git a/core/type-system/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt b/core/descriptors.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
similarity index 100%
rename from core/type-system/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
diff --git a/core/type-system/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt b/core/descriptors.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
similarity index 100%
rename from core/type-system/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
rename to core/descriptors.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 3e2ef190a28..96b254132fe 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -9,7 +9,6 @@ javaHome = rootProject.extra["JDK_16"] as String
 dependencies {
     compile(project(":core:descriptors.common"))
     compile(project(":core:util.runtime"))
-    compile(project(":core:type-system"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
 }
diff --git a/core/type-system/build.gradle.kts b/core/type-system/build.gradle.kts
deleted file mode 100644
index db3a3fa3c24..00000000000
--- a/core/type-system/build.gradle.kts
+++ /dev/null
@@ -1,22 +0,0 @@
-plugins {
-    kotlin("jvm")
-    id("jps-compatible")
-}
-
-jvmTarget = "1.6"
-javaHome = rootProject.extra["JDK_16"] as String
-
-dependencies {
-    compile(project(":core:util.runtime"))
-    compile(kotlinStdlib())
-}
-
-sourceSets {
-    "main" { projectDefault() }
-    "test" {}
-}
-
-tasks.withType<JavaCompile> {
-    sourceCompatibility = "1.6"
-    targetCompatibility = "1.6"
-}
\ No newline at end of file
diff --git a/idea/idea-frontend-api/build.gradle.kts b/idea/idea-frontend-api/build.gradle.kts
index 3a5bce2fda0..feb841b5416 100644
--- a/idea/idea-frontend-api/build.gradle.kts
+++ b/idea/idea-frontend-api/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
 
     compileOnly(project(":compiler:psi"))
     compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":core:type-system"))
+    compileOnly(project(":core:descriptors.common"))
     compileOnly(project(":idea:idea-frontend-independent"))
     compileOnly(project(":compiler:psi"))
     compileOnly(intellijCoreDep())
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index 6f9cea2361c..c8ffde3de54 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -44,7 +44,6 @@ dependencies {
     proguardDeps(kotlinStdlib())
     proguardAdditionalInJars(project(":kotlin-annotations-jvm"))
 
-    embedded(project(":core:type-system"))
     embedded(project(":kotlin-reflect-api"))
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 19075e8aa76..fec2b2a25a8 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -13,7 +13,6 @@ repositories {
 // PILL: used in pill importer
 val projectsToShadow by extra(listOf(
         ":plugins:annotation-based-compiler-plugins-ide-support",
-        ":core:type-system",
         ":compiler:backend",
         ":compiler:backend-common",
         ":compiler:backend.jvm",
diff --git a/settings.gradle b/settings.gradle
index 5a7092c38fb..5e84d03bff3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -135,7 +135,6 @@ include ":benchmarks",
         ":kotlin-jps-plugin",
         ":core:descriptors.common",
         ":core:descriptors",
-        ":core:type-system",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":core:descriptors.runtime",