diff --git a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
index 6f2ab9253f7..1626c05fa15 100644
--- a/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
+++ b/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
@@ -13,7 +13,7 @@ object JvmAnalysisFlags {
     val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean
 
     @JvmStatic
-    val javaTypeEnhancementState by AnalysisFlag.Delegates.JavaTypeEnhancementStateWarnByDefault
+    val javaTypeEnhancementState by Delegates.JavaTypeEnhancementStateWarnByDefault
 
     @JvmStatic
     val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault
@@ -34,7 +34,7 @@ object JvmAnalysisFlags {
     val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean
 
     private object Delegates {
-        object Jsr305StateWarnByDefault {
+        object JavaTypeEnhancementStateWarnByDefault {
             operator fun provideDelegate(instance: Any?, property: KProperty<*>): AnalysisFlag.Delegate<JavaTypeEnhancementState> =
                 AnalysisFlag.Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
         }
diff --git a/compiler/util/build.gradle.kts b/compiler/util/build.gradle.kts
index e721a7c0c62..0795c093dd8 100644
--- a/compiler/util/build.gradle.kts
+++ b/compiler/util/build.gradle.kts
@@ -6,8 +6,6 @@ plugins {
 dependencies {
     api(kotlinStdlib())
     api(project(":compiler:compiler.version"))
-    compile(project(":core:deserialization"))
-    compileOnly(project(":kotlin-reflect-api"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
index aed5a27045c..4d1a20ddfb1 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.config
 
-import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
@@ -34,14 +33,6 @@ class AnalysisFlag<out T> internal constructor(
             operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, ExplicitApiMode.DISABLED)
         }
 
-        object JavaTypeEnhancementStateWarnByDefault {
-            operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
-        }
-
-        object JvmDefaultModeDisabledByDefault {
-            operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JvmDefaultMode.DISABLE)
-        }
-
         object ListOfStrings {
             operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, emptyList<String>())
         }