diff --git a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt
index 1d8e6097366..7fd8199eef7 100644
--- a/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt
+++ b/idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/scopes/KtScope.kt
@@ -90,12 +90,6 @@ interface KtDeclarationScope<out T : KtSymbolWithDeclarations> : KtScope {
     val owner: T
 }
 
-interface KtPackageScope : KtScope, KtSubstitutedScope<KtPackageScope> {
+interface KtPackageScope : KtScope {
     val fqName: FqName
-}
-
-interface KtUnsubstitutedScope<S : KtScope> : KtScope {
-    fun substitute(/*substitution*/): KtSubstitutedScope<S> = TODO()
-}
-
-interface KtSubstitutedScope<S> : KtScope
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDeclaredMemberScope.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDeclaredMemberScope.kt
index a3554beebf0..3f202f35302 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDeclaredMemberScope.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirDeclaredMemberScope.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
 import org.jetbrains.kotlin.idea.frontend.api.scopes.KtDeclaredMemberScope
-import org.jetbrains.kotlin.idea.frontend.api.scopes.KtUnsubstitutedScope
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithMembers
 
 internal class KtFirDeclaredMemberScope(
@@ -21,7 +20,6 @@ internal class KtFirDeclaredMemberScope(
     builder: KtSymbolByFirBuilder
 ) : KtFirDelegatingScope<FirClassDeclaredMemberScope>(builder, token),
     KtDeclaredMemberScope,
-    KtUnsubstitutedScope<KtFirDeclaredMemberScope>,
     ValidityTokenOwner {
     override val firScope: FirClassDeclaredMemberScope by weakRef(firScope)
 }
diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirMemberScope.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirMemberScope.kt
index fbb0add016d..16e681446ec 100644
--- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirMemberScope.kt
+++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/scopes/KtFirMemberScope.kt
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.idea.frontend.api.ValidityTokenOwner
 import org.jetbrains.kotlin.idea.frontend.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.idea.frontend.api.fir.utils.weakRef
 import org.jetbrains.kotlin.idea.frontend.api.scopes.KtMemberScope
-import org.jetbrains.kotlin.idea.frontend.api.scopes.KtUnsubstitutedScope
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithMembers
 
 internal class KtFirMemberScope(
@@ -19,7 +18,7 @@ internal class KtFirMemberScope(
     firScope: FirTypeScope,
     token: ValidityToken,
     builder: KtSymbolByFirBuilder
-) : KtFirDelegatingScope<FirTypeScope>(builder, token), KtMemberScope, KtUnsubstitutedScope<KtMemberScope>, ValidityTokenOwner {
+) : KtFirDelegatingScope<FirTypeScope>(builder, token), KtMemberScope, ValidityTokenOwner {
     override val firScope: FirTypeScope by weakRef(firScope)
 }