diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index a8ce715cb87..f739cf9b053 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -1,20 +1,20 @@
 package jet
 
-public final fun </*0*/ T> arrayOfNulls(/*0*/ size : jet.Int) : jet.Array<T?>
-public final fun </*0*/ R> synchronized(/*0*/ lock : jet.Any, /*1*/ block : () -> R) : R
-public final fun jet.Any?.equals(/*0*/ other : jet.Any?) : jet.Boolean
-public final fun jet.Any?.identityEquals(/*0*/ other : jet.Any?) : jet.Boolean
-public final fun jet.BooleanIterator.iterator() : jet.BooleanIterator
-public final fun jet.ByteIterator.iterator() : jet.ByteIterator
-public final fun jet.CharIterator.iterator() : jet.CharIterator
-public final fun jet.DoubleIterator.iterator() : jet.DoubleIterator
-public final fun jet.FloatIterator.iterator() : jet.FloatIterator
-public final fun jet.IntIterator.iterator() : jet.IntIterator
-public final fun </*0*/ T> jet.Iterator<T>.iterator() : jet.Iterator<T>
-public final fun jet.LongIterator.iterator() : jet.LongIterator
-public final fun jet.ShortIterator.iterator() : jet.ShortIterator
-public final fun jet.String?.plus(/*0*/ other : jet.Any?) : jet.String
-public final fun jet.Any?.toString() : jet.String
+public fun </*0*/ T> arrayOfNulls(/*0*/ size : jet.Int) : jet.Array<T?>
+public fun </*0*/ R> synchronized(/*0*/ lock : jet.Any, /*1*/ block : () -> R) : R
+public fun jet.Any?.equals(/*0*/ other : jet.Any?) : jet.Boolean
+public fun jet.Any?.identityEquals(/*0*/ other : jet.Any?) : jet.Boolean
+public fun jet.BooleanIterator.iterator() : jet.BooleanIterator
+public fun jet.ByteIterator.iterator() : jet.ByteIterator
+public fun jet.CharIterator.iterator() : jet.CharIterator
+public fun jet.DoubleIterator.iterator() : jet.DoubleIterator
+public fun jet.FloatIterator.iterator() : jet.FloatIterator
+public fun jet.IntIterator.iterator() : jet.IntIterator
+public fun </*0*/ T> jet.Iterator<T>.iterator() : jet.Iterator<T>
+public fun jet.LongIterator.iterator() : jet.LongIterator
+public fun jet.ShortIterator.iterator() : jet.ShortIterator
+public fun jet.String?.plus(/*0*/ other : jet.Any?) : jet.String
+public fun jet.Any?.toString() : jet.String
 
 public trait Annotation {
 }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt b/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
index c987e68a96e..e8a926a9ca6 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/classObjectHeader.txt
@@ -1,6 +1,6 @@
 package test
 
-internal final fun testFun(/*0*/ a : jet.Int) : jet.Int
+internal fun testFun(/*0*/ a : jet.Int) : jet.Int
 
 internal final class TestSome</*0*/ P> {
     /*primary*/ public constructor TestSome</*0*/ P>()
diff --git a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
index dc72a566cc4..8c74c2c23bc 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/fileDependencyRecursion.txt
@@ -1,4 +1,4 @@
 package test
 
-internal final val fromImported : jet.Int
-internal final val normal : jet.Int
+internal val fromImported : jet.Int
+internal val normal : jet.Int
diff --git a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
index 710d22be55c..166fce47fdb 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/genericFunction.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ T> foo(/*0*/ t : T) : T
+internal fun </*0*/ T> foo(/*0*/ t : T) : T
diff --git a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt b/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
index a4090059f08..e4a9bd9fbe7 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/objectMembers.txt
@@ -1,6 +1,6 @@
 package test
 
-internal final val SomeObject : test.SomeObject
+internal val SomeObject : test.SomeObject
 
 internal object SomeObject {
     /*primary*/ private constructor SomeObject()
diff --git a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
index 6c04b02d942..c8fc9bfe918 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.txt
@@ -1,6 +1,6 @@
 package test
 
-internal final val Bar : test.Bar
+internal val Bar : test.Bar
 
 internal object Bar {
     /*primary*/ private constructor Bar()
diff --git a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
index 71327b215aa..49510944fe5 100644
--- a/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
+++ b/compiler/testData/lazyResolve/namespaceComparator/simpleClass.txt
@@ -5,8 +5,8 @@ internal final class A {
 }
 
 package p {
-    internal final fun foo() : Unit
-    internal final fun foo(/*0*/ a : test.p.C) : Unit
+    internal fun foo() : Unit
+    internal fun foo(/*0*/ a : test.p.C) : Unit
     
     internal final class C {
         /*primary*/ public constructor C()
diff --git a/compiler/testData/loadJavaCustom/staticFinal/expected.txt b/compiler/testData/loadJavaCustom/staticFinal/expected.txt
index c155af99981..6f394214403 100644
--- a/compiler/testData/loadJavaCustom/staticFinal/expected.txt
+++ b/compiler/testData/loadJavaCustom/staticFinal/expected.txt
@@ -1,3 +1,3 @@
 package test
 
-public final val foo : jet.String
+public val foo : jet.String
diff --git a/compiler/testData/loadKotlin/class/NamedObject.txt b/compiler/testData/loadKotlin/class/NamedObject.txt
index 431e7a030e3..11a9e80202b 100644
--- a/compiler/testData/loadKotlin/class/NamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObject.txt
@@ -1,6 +1,6 @@
 package test
 
-public final val Obj : test.Obj
+public val Obj : test.Obj
 
 public object Obj {
     /*primary*/ private constructor Obj()
diff --git a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
index 8468652e3cd..72e29f74cc4 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectInNamedObject.txt
@@ -1,6 +1,6 @@
 package test
 
-public final val Outer : test.Outer
+public val Outer : test.Outer
 
 public object Outer {
     /*primary*/ private constructor Outer()
diff --git a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index 75c52d4e33a..654bfd8af53 100644
--- a/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/testData/loadKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -1,7 +1,7 @@
 package test
 
-public final val Obj : test.Obj
-internal final val x : jet.Int
+public val Obj : test.Obj
+internal val x : jet.Int
 
 public object Obj {
     /*primary*/ private constructor Obj()
diff --git a/compiler/testData/loadKotlin/constructor/Constructor2WithOneParamDefaultValue.txt b/compiler/testData/loadKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
index 57f26eb8a70..07daf627bd3 100644
--- a/compiler/testData/loadKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
+++ b/compiler/testData/loadKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
@@ -1,5 +1,5 @@
-namespace test
+package test
 
-internal final class test.TestConstructor : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int = ?, /*1*/ s: jet.Int): test.TestConstructor
+internal final class TestConstructor {
+    /*primary*/ public constructor TestConstructor(/*0*/ p : jet.Int = ..., /*1*/ s : jet.Int)
 }
diff --git a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoDefArgs.txt b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoDefArgs.txt
index 7c2ae3799ba..ba803de1f6c 100644
--- a/compiler/testData/loadKotlin/constructor/ConstructorWithTwoDefArgs.txt
+++ b/compiler/testData/loadKotlin/constructor/ConstructorWithTwoDefArgs.txt
@@ -1,5 +1,5 @@
-namespace test
+package test
 
-internal final class test.TestConstructor : jet.Any {
-    public final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int = ?, /*1*/ d: jet.Int = ?): test.TestConstructor
+internal final class TestConstructor {
+    /*primary*/ public constructor TestConstructor(/*0*/ p : jet.Int = ..., /*1*/ d : jet.Int = ...)
 }
diff --git a/compiler/testData/loadKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/testData/loadKotlin/constructor/InnerClassConstructorWithDefArgs.txt
index f4efe81b0dd..51bed0e2f02 100644
--- a/compiler/testData/loadKotlin/constructor/InnerClassConstructorWithDefArgs.txt
+++ b/compiler/testData/loadKotlin/constructor/InnerClassConstructorWithDefArgs.txt
@@ -1,8 +1,9 @@
-namespace test
+package test
 
-internal final class test.A : jet.Any {
-    public final /*primary constructor*/ fun <init>(): test.A
-    internal final class test.A.TestConstructor : jet.Any {
-        public final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int = ?): test.A.TestConstructor
+internal final class A {
+    /*primary*/ public constructor A()
+    
+    internal final class TestConstructor {
+        /*primary*/ public constructor TestConstructor(/*0*/ p : jet.Int = ...)
     }
 }
diff --git a/compiler/testData/loadKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt b/compiler/testData/loadKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
index 75da0da795e..18334cf5721 100644
--- a/compiler/testData/loadKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
+++ b/compiler/testData/loadKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
@@ -1,5 +1,5 @@
-namespace test
+package test
 
-internal final class test.TestConstructor : jet.Any {
-    private final /*primary constructor*/ fun <init>(/*0*/ p: jet.Int = ?): test.TestConstructor
+internal final class TestConstructor {
+    /*primary*/ private constructor TestConstructor(/*0*/ p : jet.Int = ...)
 }
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
index 14b09895d3a..d477e6105ec 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunGenericParam.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ T> f() : jet.Int
+internal fun </*0*/ T> f() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
index 95f7078fe3e..c6c2a289885 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParam.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
+internal fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
index 95f7078fe3e..c6c2a289885 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamParamErased.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
+internal fun </*0*/ P> funParamParam(/*0*/ a : jet.Int, /*1*/ b : P) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
index 0b4e91ce851..07cbe77fb8f 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ P, /*1*/ Q : P> funParamReferencesParam() : jet.Int
+internal fun </*0*/ P, /*1*/ Q : P> funParamReferencesParam() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
index a9767754395..58918918e48 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.txt
@@ -1,6 +1,6 @@
 package test
 
-internal final fun </*0*/ T> foo() : Unit where T : test.Bar, T : test.Foo
+internal fun </*0*/ T> foo() : Unit where T : test.Bar, T : test.Foo
 
 internal trait Bar {
 }
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
index c5aa713acff..77c5dc5a604 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ A : java.lang.Number> uno() : jet.Int
+internal fun </*0*/ A : java.lang.Number> uno() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
index cfef8d305b7..0b199d58097 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ A> tres() : jet.Int where A : java.io.Serializable, A : java.lang.Number
+internal fun </*0*/ A> tres() : jet.Int where A : java.io.Serializable, A : java.lang.Number
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
index 4fe193ccc88..7c2325b93ab 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ A : java.io.Serializable> dos() : jet.Int
+internal fun </*0*/ A : java.io.Serializable> dos() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
index be765ddf2c0..da68bf14cab 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceClassBound.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ A> cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number
+internal fun </*0*/ A> cuatro() : jet.Int where A : java.io.Serializable, A : java.lang.Number
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
index 28d6ed64314..f2e82800895 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunParamVaragParam.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ P> funParamVarargParam(/*0*/ a : jet.Int, /*1*/ vararg b : P /*jet.Array<P>*/) : jet.Int
+internal fun </*0*/ P> funParamVarargParam(/*0*/ a : jet.Int, /*1*/ vararg b : P /*jet.Array<P>*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
index 3a830de65e8..cf0f4ae5701 100644
--- a/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ P, /*1*/ Q> funTwoTypeParams() : jet.Int
+internal fun </*0*/ P, /*1*/ Q> funTwoTypeParams() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
index b5e63d07430..55ee707a132 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ff(/*0*/ p : jet.List<jet.CharSequence>) : jet.Int
+internal fun ff(/*0*/ p : jet.List<jet.CharSequence>) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
index 57de6993f02..57b992bf77f 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ff(/*0*/ p : jet.List<java.lang.CharSequence?>) : jet.Int
+internal fun ff(/*0*/ p : jet.List<java.lang.CharSequence?>) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
index 2991e7a7a65..7135fa789fc 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff(/*0*/ a : java.lang.Integer?) : jet.Int
+internal fun fff(/*0*/ a : java.lang.Integer?) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
index 95af4c98b0f..be2866955f7 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ffgg() : jet.List<jet.CharSequence>
+internal fun ffgg() : jet.List<jet.CharSequence>
diff --git a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
index a107c35e4c7..90754606a38 100644
--- a/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
+++ b/compiler/testData/loadKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ffgg() : jet.List<jet.CharSequence?>
+internal fun ffgg() : jet.List<jet.CharSequence?>
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
index 57e8e5015d3..a6a8a663059 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ExtFun.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun jet.Int.shuffle() : jet.Int
+internal fun jet.Int.shuffle() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
index cc79cf5a5cc..bec3a40abc0 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunDefaultArg.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun funDefaultArg(/*0*/ p : jet.Int, /*1*/ q : jet.Int = ..., /*2*/ r : jet.Int = ...) : jet.Int
+internal fun funDefaultArg(/*0*/ p : jet.Int, /*1*/ q : jet.Int = ..., /*2*/ r : jet.Int = ...) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
index 63d4c44ad22..6c7ef08debf 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunParamNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff(/*0*/ a : java.lang.Integer) : jet.Int
+internal fun fff(/*0*/ a : java.lang.Integer) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
index 654f5e7efd6..870be0c4eff 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInt.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun varargInt(/*0*/ a : jet.Int, /*1*/ vararg b : jet.Int /*jet.IntArray*/) : jet.Int
+internal fun varargInt(/*0*/ a : jet.Int, /*1*/ vararg b : jet.Int /*jet.IntArray*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
index c7cca55d9d0..55233069850 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/FunVarargInteger.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun varargCharSequence(/*0*/ a : jet.Int, /*1*/ vararg b : java.lang.Integer /*jet.Array<java.lang.Integer>*/) : jet.Int
+internal fun varargCharSequence(/*0*/ a : jet.Int, /*1*/ vararg b : java.lang.Integer /*jet.Array<java.lang.Integer>*/) : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
index 340d1961e4f..d857de8b481 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/NsFun.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun f() : jet.Int
+internal fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
index b8375a6c359..4c952b3fe29 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/NsFunGetFoo.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun getFoo() : jet.Int
+internal fun getFoo() : jet.Int
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
index 06ed343bc16..9616887d5fd 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNotNull.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ff() : java.lang.Integer
+internal fun ff() : java.lang.Integer
diff --git a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
index 4f3f2b43a9f..3d2542d9996 100644
--- a/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
+++ b/compiler/testData/loadKotlin/fun/nonGeneric/ReturnTypeNullable.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun ff() : java.lang.Integer?
+internal fun ff() : java.lang.Integer?
diff --git a/compiler/testData/loadKotlin/prop/CollectionSize.txt b/compiler/testData/loadKotlin/prop/CollectionSize.txt
index 3bf7655691e..7523e67b6d1 100644
--- a/compiler/testData/loadKotlin/prop/CollectionSize.txt
+++ b/compiler/testData/loadKotlin/prop/CollectionSize.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val jet.Collection<jet.Any?>.anotherSize : jet.Int
+internal val jet.Collection<jet.Any?>.anotherSize : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValClass.txt b/compiler/testData/loadKotlin/prop/ExtValClass.txt
index 6340e273637..5fad88ab9b3 100644
--- a/compiler/testData/loadKotlin/prop/ExtValClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValClass.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
+internal val </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
diff --git a/compiler/testData/loadKotlin/prop/ExtValInt.txt b/compiler/testData/loadKotlin/prop/ExtValInt.txt
index 3293c96c7da..4ce58ebf9a5 100644
--- a/compiler/testData/loadKotlin/prop/ExtValInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValInt.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val jet.Int.itIs : jet.Int
+internal val jet.Int.itIs : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
index 7cbc4d9e2f6..b748a54e314 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequence.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val jet.Int.ggg : java.lang.CharSequence
+internal val jet.Int.ggg : java.lang.CharSequence
diff --git a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
index 17e87d20f82..6cadda3ca20 100644
--- a/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
+++ b/compiler/testData/loadKotlin/prop/ExtValIntCharSequenceQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val jet.Int.ggg : java.lang.CharSequence?
+internal val jet.Int.ggg : java.lang.CharSequence?
diff --git a/compiler/testData/loadKotlin/prop/ExtVarClass.txt b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
index 964d3742935..1fb4144a04d 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarClass.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarClass.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final var </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
+internal var </*0*/ P> P.anotherJavaClass : java.lang.Class<P>
diff --git a/compiler/testData/loadKotlin/prop/ExtVarInt.txt b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
index 6cae33646ea..77e89d5bb92 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarInt.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final var jet.Int.ggg : jet.Int
+internal var jet.Int.ggg : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
index 29d20af2867..b7b978bcf3c 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarMapPQInt.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final var </*0*/ P, /*1*/ Q> jet.Map<P, Q>.asas : jet.Int
+internal var </*0*/ P, /*1*/ Q> jet.Map<P, Q>.asas : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/ExtVarl.txt b/compiler/testData/loadKotlin/prop/ExtVarl.txt
index 92ece7f545f..fdc1787384c 100644
--- a/compiler/testData/loadKotlin/prop/ExtVarl.txt
+++ b/compiler/testData/loadKotlin/prop/ExtVarl.txt
@@ -1,4 +1,4 @@
 package test
 
-internal final var jet.Int.junk : jet.Short
-internal final val jet.String.junk : jet.Int
+internal var jet.Int.junk : jet.Short
+internal val jet.String.junk : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVal.txt b/compiler/testData/loadKotlin/prop/NsVal.txt
index 92481c7bf78..b42bcc2c171 100644
--- a/compiler/testData/loadKotlin/prop/NsVal.txt
+++ b/compiler/testData/loadKotlin/prop/NsVal.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final val nsVal : jet.Int
+internal val nsVal : jet.Int
diff --git a/compiler/testData/loadKotlin/prop/NsVar.txt b/compiler/testData/loadKotlin/prop/NsVar.txt
index 943349e2d72..f6b14e68fd3 100644
--- a/compiler/testData/loadKotlin/prop/NsVar.txt
+++ b/compiler/testData/loadKotlin/prop/NsVar.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final var nsVal : jet.Int
+internal var nsVal : jet.Int
diff --git a/compiler/testData/loadKotlin/type/Any.txt b/compiler/testData/loadKotlin/type/Any.txt
index ae31de7428e..941255f64c1 100644
--- a/compiler/testData/loadKotlin/type/Any.txt
+++ b/compiler/testData/loadKotlin/type/Any.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun any() : jet.Any
+internal fun any() : jet.Any
diff --git a/compiler/testData/loadKotlin/type/AnyQ.txt b/compiler/testData/loadKotlin/type/AnyQ.txt
index 6325de69027..b13387c6c82 100644
--- a/compiler/testData/loadKotlin/type/AnyQ.txt
+++ b/compiler/testData/loadKotlin/type/AnyQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun anyq() : jet.Any?
+internal fun anyq() : jet.Any?
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt b/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
index ef51eccddef..cb9d4dc080d 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInNumber.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothing() : jet.Array<in jet.Number>
+internal fun nothing() : jet.Array<in jet.Number>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInt.txt b/compiler/testData/loadKotlin/type/ArrayOfInt.txt
index 5989f0803b0..d2040f39efc 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInt.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInt.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.Array<jet.Int>
+internal fun fff() : jet.Array<jet.Int>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfInteger.txt b/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
index c223475f9de..a1e762f2f09 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfInteger.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothing() : jet.Array<java.lang.Integer>
+internal fun nothing() : jet.Array<java.lang.Integer>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt b/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
index 125b3d371c1..0b37bcc221c 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfOutNumber.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothing() : jet.Array<out jet.Number>
+internal fun nothing() : jet.Array<out jet.Number>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfOutT.txt b/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
index b8c0fa47f73..5668abd6e81 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfOutT.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun </*0*/ T> nothing() : jet.Array<out T>
+internal fun </*0*/ T> nothing() : jet.Array<out T>
diff --git a/compiler/testData/loadKotlin/type/ArrayOfString.txt b/compiler/testData/loadKotlin/type/ArrayOfString.txt
index 400f6aca950..7c0a676163b 100644
--- a/compiler/testData/loadKotlin/type/ArrayOfString.txt
+++ b/compiler/testData/loadKotlin/type/ArrayOfString.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.Array<jet.String>
+internal fun fff() : jet.Array<jet.String>
diff --git a/compiler/testData/loadKotlin/type/Function1IntString.txt b/compiler/testData/loadKotlin/type/Function1IntString.txt
index e78e9766543..2febf4e9372 100644
--- a/compiler/testData/loadKotlin/type/Function1IntString.txt
+++ b/compiler/testData/loadKotlin/type/Function1IntString.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fun1() : (jet.String) -> jet.Int
+internal fun fun1() : (jet.String) -> jet.Int
diff --git a/compiler/testData/loadKotlin/type/Int.txt b/compiler/testData/loadKotlin/type/Int.txt
index 530207c9708..9e1df8faed2 100644
--- a/compiler/testData/loadKotlin/type/Int.txt
+++ b/compiler/testData/loadKotlin/type/Int.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.Int
+internal fun fff() : jet.Int
diff --git a/compiler/testData/loadKotlin/type/IntArray.txt b/compiler/testData/loadKotlin/type/IntArray.txt
index d73b01843a9..c25a6c348f8 100644
--- a/compiler/testData/loadKotlin/type/IntArray.txt
+++ b/compiler/testData/loadKotlin/type/IntArray.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothing() : jet.IntArray
+internal fun nothing() : jet.IntArray
diff --git a/compiler/testData/loadKotlin/type/IntQ.txt b/compiler/testData/loadKotlin/type/IntQ.txt
index bf4ab7b280b..9b9f571fac0 100644
--- a/compiler/testData/loadKotlin/type/IntQ.txt
+++ b/compiler/testData/loadKotlin/type/IntQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.Int?
+internal fun fff() : jet.Int?
diff --git a/compiler/testData/loadKotlin/type/ListOfAny.txt b/compiler/testData/loadKotlin/type/ListOfAny.txt
index 83d4cce8e6c..1bcc63acd8b 100644
--- a/compiler/testData/loadKotlin/type/ListOfAny.txt
+++ b/compiler/testData/loadKotlin/type/ListOfAny.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun listOfAny() : jet.List<jet.Any>
+internal fun listOfAny() : jet.List<jet.Any>
diff --git a/compiler/testData/loadKotlin/type/ListOfAnyQ.txt b/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
index d2002d8fde9..a8da377d99f 100644
--- a/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
+++ b/compiler/testData/loadKotlin/type/ListOfAnyQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun listOfAnyQ() : jet.List<jet.Any?>
+internal fun listOfAnyQ() : jet.List<jet.Any?>
diff --git a/compiler/testData/loadKotlin/type/ListOfStar.txt b/compiler/testData/loadKotlin/type/ListOfStar.txt
index e7f9ad7adbc..3c8a94ea475 100644
--- a/compiler/testData/loadKotlin/type/ListOfStar.txt
+++ b/compiler/testData/loadKotlin/type/ListOfStar.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun listOfStar() : jet.List<jet.Any?>
+internal fun listOfStar() : jet.List<jet.Any?>
diff --git a/compiler/testData/loadKotlin/type/ListOfString.txt b/compiler/testData/loadKotlin/type/ListOfString.txt
index 0493b84b9d7..6fd33d91364 100644
--- a/compiler/testData/loadKotlin/type/ListOfString.txt
+++ b/compiler/testData/loadKotlin/type/ListOfString.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : java.util.List<jet.String>
+internal fun fff() : java.util.List<jet.String>
diff --git a/compiler/testData/loadKotlin/type/ListOfjlString.txt b/compiler/testData/loadKotlin/type/ListOfjlString.txt
index f18c5113736..bf5dd53bb74 100644
--- a/compiler/testData/loadKotlin/type/ListOfjlString.txt
+++ b/compiler/testData/loadKotlin/type/ListOfjlString.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun listOfJlString() : java.util.List<java.lang.String>
+internal fun listOfJlString() : java.util.List<java.lang.String>
diff --git a/compiler/testData/loadKotlin/type/Nothing.txt b/compiler/testData/loadKotlin/type/Nothing.txt
index ab03441d77a..bcd2ba893b9 100644
--- a/compiler/testData/loadKotlin/type/Nothing.txt
+++ b/compiler/testData/loadKotlin/type/Nothing.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothing() : jet.Nothing
+internal fun nothing() : jet.Nothing
diff --git a/compiler/testData/loadKotlin/type/NothingQ.txt b/compiler/testData/loadKotlin/type/NothingQ.txt
index b7daf1c3bdc..79af6a60bf3 100644
--- a/compiler/testData/loadKotlin/type/NothingQ.txt
+++ b/compiler/testData/loadKotlin/type/NothingQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun nothingq() : jet.Nothing?
+internal fun nothingq() : jet.Nothing?
diff --git a/compiler/testData/loadKotlin/type/String.txt b/compiler/testData/loadKotlin/type/String.txt
index 337d033e6d7..2e6a3f9947b 100644
--- a/compiler/testData/loadKotlin/type/String.txt
+++ b/compiler/testData/loadKotlin/type/String.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.String
+internal fun fff() : jet.String
diff --git a/compiler/testData/loadKotlin/type/StringQ.txt b/compiler/testData/loadKotlin/type/StringQ.txt
index 187ca2fcf64..ea794bd3d56 100644
--- a/compiler/testData/loadKotlin/type/StringQ.txt
+++ b/compiler/testData/loadKotlin/type/StringQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : jet.String?
+internal fun fff() : jet.String?
diff --git a/compiler/testData/loadKotlin/type/Tuple0.txt b/compiler/testData/loadKotlin/type/Tuple0.txt
index 2e445871231..046ce27bbd6 100644
--- a/compiler/testData/loadKotlin/type/Tuple0.txt
+++ b/compiler/testData/loadKotlin/type/Tuple0.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun tuple0() : Unit
+internal fun tuple0() : Unit
diff --git a/compiler/testData/loadKotlin/type/jlInteger.txt b/compiler/testData/loadKotlin/type/jlInteger.txt
index a48b287a78a..07ecbd3f156 100644
--- a/compiler/testData/loadKotlin/type/jlInteger.txt
+++ b/compiler/testData/loadKotlin/type/jlInteger.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun integer() : java.lang.Integer
+internal fun integer() : java.lang.Integer
diff --git a/compiler/testData/loadKotlin/type/jlIntegerQ.txt b/compiler/testData/loadKotlin/type/jlIntegerQ.txt
index 8da55e88cad..f0b1ea79810 100644
--- a/compiler/testData/loadKotlin/type/jlIntegerQ.txt
+++ b/compiler/testData/loadKotlin/type/jlIntegerQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun integerq() : java.lang.Integer?
+internal fun integerq() : java.lang.Integer?
diff --git a/compiler/testData/loadKotlin/type/jlNumber.txt b/compiler/testData/loadKotlin/type/jlNumber.txt
index 55131a8f74e..0add814f191 100644
--- a/compiler/testData/loadKotlin/type/jlNumber.txt
+++ b/compiler/testData/loadKotlin/type/jlNumber.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun number() : java.lang.Number
+internal fun number() : java.lang.Number
diff --git a/compiler/testData/loadKotlin/type/jlObject.txt b/compiler/testData/loadKotlin/type/jlObject.txt
index 243a5b6575a..bc5c7022b4d 100644
--- a/compiler/testData/loadKotlin/type/jlObject.txt
+++ b/compiler/testData/loadKotlin/type/jlObject.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun obj() : java.lang.Object
+internal fun obj() : java.lang.Object
diff --git a/compiler/testData/loadKotlin/type/jlObjectQ.txt b/compiler/testData/loadKotlin/type/jlObjectQ.txt
index b54e85af61f..7311a12e413 100644
--- a/compiler/testData/loadKotlin/type/jlObjectQ.txt
+++ b/compiler/testData/loadKotlin/type/jlObjectQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun objq() : java.lang.Object?
+internal fun objq() : java.lang.Object?
diff --git a/compiler/testData/loadKotlin/type/jlString.txt b/compiler/testData/loadKotlin/type/jlString.txt
index 1e605b5abad..32e8fd6b7fe 100644
--- a/compiler/testData/loadKotlin/type/jlString.txt
+++ b/compiler/testData/loadKotlin/type/jlString.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : java.lang.String
+internal fun fff() : java.lang.String
diff --git a/compiler/testData/loadKotlin/type/jlStringQ.txt b/compiler/testData/loadKotlin/type/jlStringQ.txt
index 4d2d9f97ab6..6739d777afa 100644
--- a/compiler/testData/loadKotlin/type/jlStringQ.txt
+++ b/compiler/testData/loadKotlin/type/jlStringQ.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final fun fff() : java.lang.String?
+internal fun fff() : java.lang.String?
diff --git a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
index 124e0c8381d..cda899a38a1 100644
--- a/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
+++ b/compiler/testData/loadKotlin/visibility/InternalTopLevelMembers.txt
@@ -1,4 +1,4 @@
 package test
 
-internal final val x : jet.Int
-internal final fun f() : jet.Int
+internal val x : jet.Int
+internal fun f() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
index 83a61566060..63fdb691032 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateTopLevelFun.txt
@@ -1,3 +1,3 @@
 package test
 
-private final fun topLevelFun() : jet.Int
+private fun topLevelFun() : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
index 422e48c997d..b6dd6f200a3 100644
--- a/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
+++ b/compiler/testData/loadKotlin/visibility/PrivateTopLevelVal.txt
@@ -1,3 +1,3 @@
 package test
 
-private final val topLevelVal : jet.Int
+private val topLevelVal : jet.Int
diff --git a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
index 466278ff4fe..12baf0a479d 100644
--- a/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
+++ b/compiler/testData/loadKotlin/visibility/TopLevelVarWithPrivateSetter.txt
@@ -1,3 +1,3 @@
 package test
 
-internal final var topLevelVar : jet.Int
+internal var topLevelVar : jet.Int