diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt
index 164788d4e4a..323e1ca952c 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt
@@ -11,7 +11,10 @@ import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirPureAbstractElement
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.FirSourceElement
-import org.jetbrains.kotlin.fir.declarations.*
+import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.declarations.FirRegularClass
+import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
 import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
 import org.jetbrains.kotlin.fir.declarations.impl.FirModifiableClass
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
@@ -62,12 +65,6 @@ class FirJavaClass internal constructor(
         superTypeRefs.addAll(newSuperTypeRefs)
     }
 
-    override var supertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
-
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceResolvePhase(newResolvePhase: FirResolvePhase) {
         resolvePhase = newResolvePhase
     }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt
index af2b0da25a7..28da8ace059 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt
@@ -24,7 +24,6 @@ abstract class FirAnonymousObject : FirPureAbstractElement(), FirClass<FirAnonym
     abstract override val source: FirSourceElement?
     abstract override val session: FirSession
     abstract override val resolvePhase: FirResolvePhase
-    abstract override val supertypesComputationStatus: SupertypesComputationStatus
     abstract override val classKind: ClassKind
     abstract override val superTypeRefs: List<FirTypeRef>
     abstract override val declarations: List<FirDeclaration>
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt
index a516c9621da..1f3936132d9 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClass.kt
@@ -24,7 +24,6 @@ interface FirClass<F : FirClass<F>> : FirClassLikeDeclaration<F>, FirStatement,
     override val source: FirSourceElement?
     override val session: FirSession
     override val resolvePhase: FirResolvePhase
-    override val supertypesComputationStatus: SupertypesComputationStatus
     override val symbol: FirClassSymbol<F>
     val classKind: ClassKind
     val superTypeRefs: List<FirTypeRef>
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt
index 0ab80944471..34662c4b314 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt
@@ -23,10 +23,7 @@ interface FirClassLikeDeclaration<F : FirClassLikeDeclaration<F>> : FirDeclarati
     override val session: FirSession
     override val resolvePhase: FirResolvePhase
     override val annotations: List<FirAnnotationCall>
-    val supertypesComputationStatus: SupertypesComputationStatus
     override val symbol: FirClassLikeSymbol<F>
 
     override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R = visitor.visitClassLikeDeclaration(this, data)
-
-    fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus)
 }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
index 11e21aaa73a..6dad1eb5586 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
@@ -29,7 +29,6 @@ abstract class FirEnumEntry : FirPureAbstractElement(), FirRegularClass {
     abstract override val annotations: List<FirAnnotationCall>
     abstract override val typeParameters: List<FirTypeParameter>
     abstract override val status: FirDeclarationStatus
-    abstract override val supertypesComputationStatus: SupertypesComputationStatus
     abstract override val classKind: ClassKind
     abstract override val declarations: List<FirDeclaration>
     abstract override val symbol: FirRegularClassSymbol
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt
index d5733363447..049bffc3cc7 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt
@@ -27,7 +27,6 @@ interface FirRegularClass : FirMemberDeclaration, FirTypeParametersOwner, FirCla
     override val annotations: List<FirAnnotationCall>
     override val typeParameters: List<FirTypeParameter>
     override val status: FirDeclarationStatus
-    override val supertypesComputationStatus: SupertypesComputationStatus
     override val classKind: ClassKind
     override val declarations: List<FirDeclaration>
     override val symbol: FirRegularClassSymbol
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt
index 390acc21436..18f83ce3216 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirSealedClass.kt
@@ -29,7 +29,6 @@ abstract class FirSealedClass : FirPureAbstractElement(), FirRegularClass {
     abstract override val annotations: List<FirAnnotationCall>
     abstract override val typeParameters: List<FirTypeParameter>
     abstract override val status: FirDeclarationStatus
-    abstract override val supertypesComputationStatus: SupertypesComputationStatus
     abstract override val classKind: ClassKind
     abstract override val declarations: List<FirDeclaration>
     abstract override val symbol: FirRegularClassSymbol
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt
index dffabeb262e..15a54e6b406 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt
@@ -23,7 +23,6 @@ abstract class FirTypeAlias : FirPureAbstractElement(), FirClassLikeDeclaration<
     abstract override val source: FirSourceElement?
     abstract override val session: FirSession
     abstract override val resolvePhase: FirResolvePhase
-    abstract override val supertypesComputationStatus: SupertypesComputationStatus
     abstract override val name: Name
     abstract override val typeParameters: List<FirTypeParameter>
     abstract override val status: FirDeclarationStatus
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt
index 555e154f238..a27438b16f6 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol
@@ -30,7 +29,6 @@ class FirAnonymousObjectImpl(
     override val symbol: FirAnonymousObjectSymbol
 ) : FirAnonymousObject(), FirModifiableClass<FirAnonymousObject>, FirAbstractAnnotatedElement {
     override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR
-    override var supertypesComputationStatus: SupertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
     override val classKind: ClassKind get() = ClassKind.OBJECT
     override val superTypeRefs: MutableList<FirTypeRef> = mutableListOf()
     override val declarations: MutableList<FirDeclaration> = mutableListOf()
@@ -60,10 +58,6 @@ class FirAnonymousObjectImpl(
         resolvePhase = newResolvePhase
     }
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>) {
         superTypeRefs.clear()
         superTypeRefs.addAll(newSuperTypeRefs)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt
index a16edea3c9f..3fb8a3acf91 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirClassImpl.kt
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
@@ -38,7 +37,6 @@ class FirClassImpl(
     override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
-    override var supertypesComputationStatus: SupertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
     override val declarations: MutableList<FirDeclaration> = mutableListOf()
     override var companionObject: FirRegularClass? = null
     override val superTypeRefs: MutableList<FirTypeRef> = mutableListOf()
@@ -76,10 +74,6 @@ class FirClassImpl(
         resolvePhase = newResolvePhase
     }
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>) {
         superTypeRefs.clear()
         superTypeRefs.addAll(newSuperTypeRefs)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
index bd5175dc57e..7b397b4f7a9 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.declarations.FirEnumEntry
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.expressions.FirExpression
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
@@ -40,7 +39,6 @@ class FirEnumEntryImpl(
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
     override var status: FirDeclarationStatus = FirDeclarationStatusImpl(Visibilities.UNKNOWN, Modality.FINAL)
-    override var supertypesComputationStatus: SupertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
     override val classKind: ClassKind get() = ClassKind.ENUM_ENTRY
     override val declarations: MutableList<FirDeclaration> = mutableListOf()
     override val companionObject: FirRegularClass? get() = null
@@ -87,10 +85,6 @@ class FirEnumEntryImpl(
         resolvePhase = newResolvePhase
     }
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>) {
         superTypeRefs.clear()
         superTypeRefs.addAll(newSuperTypeRefs)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt
index 418483ebfc8..2a4e9aedc3c 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableClass.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.fir.FirSourceElement
 import org.jetbrains.kotlin.fir.declarations.FirClass
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
@@ -27,7 +26,6 @@ interface FirModifiableClass<F : FirClass<F>>  : FirClass<F>, FirAbstractAnnotat
     override val source: FirSourceElement?
     override val session: FirSession
     override var resolvePhase: FirResolvePhase
-    override var supertypesComputationStatus: SupertypesComputationStatus
     override val symbol: FirClassSymbol<F>
     override val classKind: ClassKind
     override val superTypeRefs: MutableList<FirTypeRef>
@@ -37,7 +35,5 @@ interface FirModifiableClass<F : FirClass<F>>  : FirClass<F>, FirAbstractAnnotat
 
     override fun replaceResolvePhase(newResolvePhase: FirResolvePhase)
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus)
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>)
 }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt
index 98a1b4e1b1e..551085e2160 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirModifiableRegularClass.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
@@ -34,7 +33,6 @@ interface FirModifiableRegularClass : FirRegularClass, FirModifiableClass<FirReg
     override val annotations: MutableList<FirAnnotationCall>
     override val typeParameters: MutableList<FirTypeParameter>
     override var status: FirDeclarationStatus
-    override var supertypesComputationStatus: SupertypesComputationStatus
     override val classKind: ClassKind
     override val declarations: MutableList<FirDeclaration>
     override val symbol: FirRegularClassSymbol
@@ -46,7 +44,5 @@ interface FirModifiableRegularClass : FirRegularClass, FirModifiableClass<FirReg
 
     override fun replaceResolvePhase(newResolvePhase: FirResolvePhase)
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus)
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>)
 }
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt
index ffb752db740..6f600feb55b 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirSealedClassImpl.kt
@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.FirSealedClass
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
@@ -39,7 +38,6 @@ class FirSealedClassImpl(
     override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
     override val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
-    override var supertypesComputationStatus: SupertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
     override val declarations: MutableList<FirDeclaration> = mutableListOf()
     override var companionObject: FirRegularClass? = null
     override val superTypeRefs: MutableList<FirTypeRef> = mutableListOf()
@@ -78,10 +76,6 @@ class FirSealedClassImpl(
         resolvePhase = newResolvePhase
     }
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceSuperTypeRefs(newSuperTypeRefs: List<FirTypeRef>) {
         superTypeRefs.clear()
         superTypeRefs.addAll(newSuperTypeRefs)
diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt
index 301e3df65ef..826cd484cbe 100644
--- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt
+++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
 import org.jetbrains.kotlin.fir.declarations.FirTypeAlias
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
-import org.jetbrains.kotlin.fir.declarations.SupertypesComputationStatus
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.impl.FirAbstractAnnotatedElement
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
@@ -33,7 +32,6 @@ class FirTypeAliasImpl(
     override var expandedTypeRef: FirTypeRef
 ) : FirTypeAlias(), FirModifiableTypeParametersOwner, FirAbstractAnnotatedElement {
     override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR
-    override var supertypesComputationStatus: SupertypesComputationStatus = SupertypesComputationStatus.NOT_COMPUTED
     override val typeParameters: MutableList<FirTypeParameter> = mutableListOf()
     override val annotations: MutableList<FirAnnotationCall> = mutableListOf()
 
@@ -65,10 +63,6 @@ class FirTypeAliasImpl(
         resolvePhase = newResolvePhase
     }
 
-    override fun replaceSupertypesComputationStatus(newSupertypesComputationStatus: SupertypesComputationStatus) {
-        supertypesComputationStatus = newSupertypesComputationStatus
-    }
-
     override fun replaceExpandedTypeRef(newExpandedTypeRef: FirTypeRef) {
         expandedTypeRef = newExpandedTypeRef
     }
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
index 1ff7af0beeb..92f31a50001 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
@@ -60,7 +60,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
         val regularClassConfig: ImplementationContext.() -> Unit = {
             parents += modifiableRegularClass
             defaultNull("companionObject")
-            defaultSupertypesComputationStatus()
         }
         impl(regularClass, "FirClassImpl", regularClassConfig)
 
@@ -72,7 +71,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
                 value = "ClassKind.OBJECT"
                 withGetter = true
             }
-            defaultSupertypesComputationStatus()
         }
 
         impl(enumEntry) {
@@ -88,13 +86,11 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
                 withGetter = true
             }
             default("typeRef", "session.builtinTypes.enumType")
-            defaultSupertypesComputationStatus()
             useTypes(visibilitiesType, modalityType)
         }
 
         impl(typeAlias) {
             parents += modifiableTypeParametersOwner
-            defaultSupertypesComputationStatus()
         }
 
         impl(import)
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
index 1d4eb4d1848..77bde655d9b 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
@@ -205,7 +205,6 @@ object NodeConfigurator : AbstractFieldConfigurator() {
         classLikeDeclaration.configure {
             withArg("F", "FirClassLikeDeclaration<F>")
             parentArg(symbolOwner, "F", "F")
-            +field("supertypesComputationStatus", type("fir.declarations", "SupertypesComputationStatus"), withReplace = true).apply { isMutable = true }
             +symbol("FirClassLikeSymbol", "F")
         }
 
diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt
index 4e30bb9ac48..c1de9b885fc 100644
--- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt
+++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/context/AbstractFirTreeImplementationConfigurator.kt
@@ -164,10 +164,6 @@ abstract class AbstractFirTreeImplementationConfigurator {
             }
         }
 
-        fun defaultSupertypesComputationStatus() {
-            default("supertypesComputationStatus", "SupertypesComputationStatus.NOT_COMPUTED")
-        }
-
         fun default(field: String, init: DefaultValueContext.() -> Unit) {
             DefaultValueContext(getField(field)).apply(init).applyConfiguration()
         }
@@ -232,4 +228,4 @@ abstract class AbstractFirTreeImplementationConfigurator {
             }
         }
     }
-}
\ No newline at end of file
+}