diff --git a/compiler/testData/loadJava/compiledJava/EnumMembers.txt b/compiler/testData/loadJava/compiledJava/EnumMembers.txt
index a7bcebab595..55facbfd1fa 100644
--- a/compiler/testData/loadJava/compiledJava/EnumMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/EnumMembers.txt
@@ -6,20 +6,20 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers> {
     public open fun first(): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    
+
     public class object <class-object-for-EnumMembers> {
         private constructor <class-object-for-EnumMembers>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.EnumMembers
         public final /*synthesized*/ fun values(): kotlin.Array<test.EnumMembers>
     }
-    
+
     public enum entry FIRST : test.EnumMembers {
         private constructor FIRST()
         public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-FIRST> : test.EnumMembers.FIRST {
             private constructor <class-object-for-FIRST>()
             public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
@@ -28,14 +28,14 @@ public final enum class EnumMembers : kotlin.Enum<test.EnumMembers> {
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
+
     public enum entry SECOND : test.EnumMembers {
         private constructor SECOND()
         public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun first(): kotlin.Boolean
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-SECOND> : test.EnumMembers.SECOND {
             private constructor <class-object-for-SECOND>()
             public final override /*1*/ /*fake_override*/ val isFirst: kotlin.Boolean
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
index d5f746a55ee..7d7d206d116 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
@@ -1,27 +1,27 @@
 package test
 
-public open class InnerOfGeneric : java.lang.Object {
+public open class InnerOfGeneric {
     public constructor InnerOfGeneric()
-    
-    public abstract inner class A</*0*/ K> : java.lang.Object {
+
+    public abstract inner class A</*0*/ K> {
         public constructor A</*0*/ K>()
-        
+
         public abstract inner class Inner : test.InnerOfGeneric.S<K> {
             public constructor Inner()
             public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<K>?
         }
     }
-    
+
     public open inner class B</*0*/ L> : test.InnerOfGeneric.A<L> {
         public constructor B</*0*/ L>()
-        
+
         public open inner class SubInner : test.InnerOfGeneric.A.Inner {
             public constructor SubInner()
             public open override /*1*/ fun iterator(): kotlin.MutableIterator<L>?
         }
     }
-    
-    public trait S</*0*/ E> : java.lang.Object {
+
+    public trait S</*0*/ E> {
         public abstract fun iterator(): kotlin.MutableIterator<E>?
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/JavaEnum.txt b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
index 4e828c57f33..672422d6ba1 100644
--- a/compiler/testData/loadJava/compiledJava/JavaEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/JavaEnum.txt
@@ -4,30 +4,30 @@ public final enum class JavaEnum : kotlin.Enum<test.JavaEnum> {
     private constructor JavaEnum()
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    
+
     public class object <class-object-for-JavaEnum> {
         private constructor <class-object-for-JavaEnum>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.JavaEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.JavaEnum>
     }
-    
+
     public enum entry ANOTHER : test.JavaEnum {
         private constructor ANOTHER()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-ANOTHER> : test.JavaEnum.ANOTHER {
             private constructor <class-object-for-ANOTHER>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
+
     public enum entry ENTRY : test.JavaEnum {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-ENTRY> : test.JavaEnum.ENTRY {
             private constructor <class-object-for-ENTRY>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
index 73863464dd5..d862e396a9f 100644
--- a/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.txt
@@ -1,15 +1,15 @@
 package test
 
-public open class OverrideMethod : java.lang.Object {
+public open class OverrideMethod {
     public constructor OverrideMethod()
-    
+
     public/*package*/ open inner class Base : test.OverrideMethod.SuperBase {
         public/*package*/ constructor Base()
         public/*package*/ open fun bar(): kotlin.Unit
         public/*package*/ open fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
         public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }
-    
+
     public/*package*/ open inner class Derived : test.OverrideMethod.Base {
         public/*package*/ constructor Derived()
         public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
@@ -17,8 +17,8 @@ public open class OverrideMethod : java.lang.Object {
         public/*package*/ open override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
         public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }
-    
-    public/*package*/ open inner class SuperBase : java.lang.Object {
+
+    public/*package*/ open inner class SuperBase {
         public/*package*/ constructor SuperBase()
         public/*package*/ open fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembers.txt b/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
index 4463db12d23..0bf31dd1820 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembers.txt
@@ -1,21 +1,21 @@
 package test
 
-public open class PrivateMembers : java.lang.Object {
+public open class PrivateMembers {
     private constructor PrivateMembers()
     private final var field: kotlin.Int
     private open fun method(): kotlin.Unit
     private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
 
-    private open inner class Inner : java.lang.Object {
+    private open inner class Inner {
         private constructor Inner()
     }
 
-    private open class Nested : java.lang.Object {
+    private open class Nested {
         private constructor Nested()
     }
 
-    private trait SamInterface : java.lang.Object {
+    private trait SamInterface {
         public abstract fun foo(): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
index 7275997f1a3..b59e47ac24d 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class PrivateMembersInHierarchy : java.lang.Object {
+public open class PrivateMembersInHierarchy {
     public constructor PrivateMembersInHierarchy()
 
     public open class Sub : test.PrivateMembersInHierarchy.Super {
@@ -10,7 +10,7 @@ public open class PrivateMembersInHierarchy : java.lang.Object {
         private open fun method(): kotlin.Unit
     }
 
-    public open class Super : java.lang.Object {
+    public open class Super {
         public constructor Super()
         private final var field: kotlin.Int
         private final var field2: kotlin.Int
diff --git a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
index 5b0433a8955..91f7c59dfff 100644
--- a/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait RawTypeWithUpperBound : java.lang.Object {
-    
-    public trait Bar : java.lang.Object {
+public trait RawTypeWithUpperBound {
+
+    public trait Bar {
         public abstract fun f(/*0*/ p0: test.RawTypeWithUpperBound.Foo<out kotlin.CharSequence?>?): kotlin.Unit
     }
-    
-    public trait Foo</*0*/ T : kotlin.CharSequence?> : java.lang.Object {
+
+    public trait Foo</*0*/ T : kotlin.CharSequence?> {
     }
 }
 
diff --git a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
index adef560b0d3..59c1036ded4 100644
--- a/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RawUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RawUpperBound</*0*/ T : test.RawUpperBound<out kotlin.Any?>?> {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
index 6a5f9eb134c..684244f18b2 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RecursiveRawUpperBound</*0*/ T : test.RecursiveRawUpperBound<out kotlin.Any?>?> {
 }
diff --git a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
index b0b52051f5e..f5e40bcc113 100644
--- a/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>?> : java.lang.Object {
+public trait RecursiveWildcardUpperBound</*0*/ T : test.RecursiveWildcardUpperBound<out kotlin.Any?>?> {
 }
diff --git a/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
index 7285b16ccb4..4f0adfdce0a 100644
--- a/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
+++ b/compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
@@ -1,9 +1,9 @@
 package test
 
-public/*package*/ open class B : java.lang.Object {
+public/*package*/ open class B {
     public/*package*/ constructor B(/*0*/ p0: test.B.C?)
-    
-    public/*package*/ trait C : java.lang.Object {
+
+    public/*package*/ trait C {
     }
 }
 
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
index 400477ed354..0253de3ed0a 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
@@ -1,45 +1,45 @@
 package test
 
-public trait AnnotationInParam : java.lang.Object {
-    
-    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
+public trait AnnotationInParam {
+
+    test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A {
         public constructor A()
     }
-    
-    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
+
+    test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B {
         public constructor B()
     }
-    
-    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
+
+    test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C {
         public constructor C()
     }
-    
+
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
+
     public final annotation class MyAnnotation2 : kotlin.Annotation {
         public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun value(): kotlin.Array<kotlin.String>
     }
-    
+
     public final annotation class MyAnnotation3 : kotlin.Annotation {
         public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
         public abstract fun first(): kotlin.String
         public abstract fun second(): kotlin.String
     }
-    
+
     public final annotation class MyAnnotationWithParam : kotlin.Annotation {
         public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation)
         public abstract fun value(): test.AnnotationInParam.MyAnnotation
     }
-    
+
     public final annotation class MyAnnotationWithParam2 : kotlin.Annotation {
         public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2)
         public abstract fun value(): test.AnnotationInParam.MyAnnotation2
     }
-    
+
     public final annotation class MyAnnotationWithParam3 : kotlin.Annotation {
         public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3)
         public abstract fun value(): test.AnnotationInParam.MyAnnotation3
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
index b22e856e8cf..a876eb5e40d 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
@@ -1,14 +1,14 @@
 package test
 
-public open class ArithmeticExpressionInParam : java.lang.Object {
+public open class ArithmeticExpressionInParam {
     public constructor ArithmeticExpressionInParam()
-    
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.Int)
         public abstract fun value(): kotlin.Int
     }
-    
-    test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class : java.lang.Object {
+
+    test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class {
         public constructor Class()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
index f6f9550a218..ec04c206e72 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
@@ -1,7 +1,7 @@
 package test
 
-public trait ArrayOfEnumInParam : java.lang.Object {
-    
+public trait ArrayOfEnumInParam {
+
     java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array<java.lang.annotation.ElementType>) public final annotation class targetAnnotation : kotlin.Annotation {
         public constructor targetAnnotation(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
index 5d0e5cebeaa..ad7b5fdd9a2 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
@@ -1,11 +1,11 @@
 package test
 
-public trait ArrayOfStringInParam : java.lang.Object {
-    
-    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
+public trait ArrayOfStringInParam {
+
+    test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A {
         public constructor A()
     }
-    
+
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun value(): kotlin.Array<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
index 902f6d8b71c..9a0413b006e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
@@ -1,14 +1,14 @@
 package test
 
-public open class ClassObjectArrayInParam : java.lang.Object {
+public open class ClassObjectArrayInParam {
     public constructor ClassObjectArrayInParam()
-    
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ vararg value: java.lang.Class<out kotlin.Any?> /*kotlin.Array<java.lang.Class<out kotlin.Any?>>*/)
         public abstract fun value(): kotlin.Array<java.lang.Class<out kotlin.Any?>>
     }
-    
-    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested : java.lang.Object {
+
+    test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested {
         public constructor Nested()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
index 7b401d346fb..49ec309a11b 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
@@ -1,14 +1,14 @@
 package test
 
-public open class ClassObjectInParam : java.lang.Object {
+public open class ClassObjectInParam {
     public constructor ClassObjectInParam()
-    
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: java.lang.Class<out kotlin.Any?>)
         public abstract fun value(): java.lang.Class<out kotlin.Any?>
     }
-    
-    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested : java.lang.Object {
+
+    test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
         public constructor Nested()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
index 18e090f7bfb..515dde7b6e9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
@@ -1,28 +1,28 @@
 package test
 
-public trait CustomAnnotation : java.lang.Object {
-    
+public trait CustomAnnotation {
+
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
         public abstract fun value(): test.CustomAnnotation.MyEnum
     }
-    
+
     public final enum class MyEnum : kotlin.Enum<test.CustomAnnotation.MyEnum> {
         private constructor MyEnum()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-MyEnum> {
             private constructor <class-object-for-MyEnum>()
             public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
             public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
         }
-        
+
         public enum entry ONE : test.CustomAnnotation.MyEnum {
             private constructor ONE()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-            
+
             public class object <class-object-for-ONE> : test.CustomAnnotation.MyEnum.ONE {
                 private constructor <class-object-for-ONE>()
                 public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -30,8 +30,8 @@ public trait CustomAnnotation : java.lang.Object {
             }
         }
     }
-    
-    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest : java.lang.Object {
+
+    test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
         public constructor MyTest()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
index d1c3e3262c8..a0a612a9947 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait CustomAnnotationWithDefaultParameter : java.lang.Object {
-    
+public trait CustomAnnotationWithDefaultParameter {
+
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...)
         public abstract fun first(): kotlin.String
         public abstract fun second(): kotlin.String
     }
-    
-    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest : java.lang.Object {
+
+    test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest {
         public constructor MyTest()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
index 4e4186709a7..8bd2efdce70 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
@@ -1,11 +1,11 @@
 package test
 
-public trait EmptyArrayInParam : java.lang.Object {
-    
-    test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
+public trait EmptyArrayInParam {
+
+    test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A {
         public constructor A()
     }
-    
+
     public final annotation class MyAnnotation : kotlin.Annotation {
         public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
         public abstract fun value(): kotlin.Array<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
index 597d9368152..ccc5c28fe0c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
@@ -1,7 +1,7 @@
 package test
 
-public trait EnumInParam : java.lang.Object {
-    
+public trait EnumInParam {
+
     java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation {
         public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
index 41a81afd4f9..aff0b3debc5 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
@@ -1,11 +1,11 @@
 package test
 
-public trait PrimitiveValueInParam : java.lang.Object {
-    
-    test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
+public trait PrimitiveValueInParam {
+
+    test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A {
         public constructor A()
     }
-    
+
     public final annotation class Ann : kotlin.Annotation {
         public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String)
         public abstract fun bool(): kotlin.Boolean
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
index 8a3eb6b155e..04229db6562 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait RecursiveAnnotation : java.lang.Object {
-    
+public trait RecursiveAnnotation {
+
     test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
+
     test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class B : kotlin.Annotation {
         public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
         public abstract fun value(): test.RecursiveAnnotation.A
diff --git a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
index 3d22b72e715..7c48173b7b3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait RecursiveAnnotation2 : java.lang.Object {
-    
+public trait RecursiveAnnotation2 {
+
     public final annotation class A : kotlin.Annotation {
         public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)
         public abstract fun value(): test.RecursiveAnnotation2.B
     }
-    
+
     test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": kotlin.String): test.RecursiveAnnotation2.B) public final annotation class B : kotlin.Annotation {
         public constructor B(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
index 9290a31148f..fd7790b8f7f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait StringConcatenationInParam : java.lang.Object {
-    
+public trait StringConcatenationInParam {
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
-    test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+
+    test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
index 796bb214515..4ff9e52b3b0 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait StringConstantInParam : java.lang.Object {
-    
+public trait StringConstantInParam {
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
-    test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+
+    test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
index bbb3fe884e9..84c91d6efbe 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait StringInParam : java.lang.Object {
-    
+public trait StringInParam {
+
     public final annotation class Anno : kotlin.Annotation {
         public constructor Anno(/*0*/ value: kotlin.String)
         public abstract fun value(): kotlin.String
     }
-    
-    test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
+
+    test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class {
         public constructor Class()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
index 77c1c029b16..a0e229ec8da 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class ProtectedPackageConstructor : java.lang.Object {
+public open class ProtectedPackageConstructor {
     public constructor ProtectedPackageConstructor()
-    
-    protected/*protected static*/ open class Foo : java.lang.Object {
+
+    protected/*protected static*/ open class Foo {
         protected/*protected and package*/ constructor Foo()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
index 7dce629a171..c39445fb8d2 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ProtectedPackageFun : java.lang.Object {
+public open class ProtectedPackageFun {
     public constructor ProtectedPackageFun()
     protected/*protected and package*/ open fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
index ef369cb29b6..85268b6f9bf 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ProtectedPackageProperty : java.lang.Object {
+public open class ProtectedPackageProperty {
     public constructor ProtectedPackageProperty()
     protected/*protected and package*/ final var foo: kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
index 20b0a080ccc..9e7b4fdd5d1 100644
--- a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class ConstructorInProtectedStaticNestedClass : java.lang.Object {
+public open class ConstructorInProtectedStaticNestedClass {
     public constructor ConstructorInProtectedStaticNestedClass()
-    
-    protected/*protected static*/ open class Inner : java.lang.Object {
+
+    protected/*protected static*/ open class Inner {
         protected/*protected and package*/ constructor Inner()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
index b1528e24b78..995b232f802 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator<T>
 
-public trait Comparator</*0*/ T> : java.lang.Object {
+public trait Comparator</*0*/ T> {
     public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
index c4811263030..773be763152 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter
 
-public trait FilenameFilter : java.lang.Object {
+public trait FilenameFilter {
     public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
index 8e3184acedb..a22ae28f067 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T?) -> T?): test.GenericInterfaceParameterWithSelfBound<T>
 
-public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> : java.lang.Object {
+public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> {
     public abstract fun method(/*0*/ p0: T?): T?
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
index ecbe0188989..33cc5556db6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<out A>?, B?) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : java.lang.Cloneable?
 
-public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> : java.lang.Object where A : java.lang.Cloneable? {
+public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> where A : java.lang.Cloneable? {
     public abstract fun method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
index 1d09e6552d2..b60140c424c 100644
--- a/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
@@ -1,5 +1,5 @@
 package test
 
-public trait GenericMethodParameters : java.lang.Object {
+public trait GenericMethodParameters {
     public abstract fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
index 540ccd08d20..7727fe5cdbd 100644
--- a/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
@@ -1,4 +1,4 @@
 package test
 
-public trait InterfaceWithObjectMethod : java.lang.Object {
+public trait InterfaceWithObjectMethod {
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/Nested.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.txt
index b2b156cc448..f044e356498 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Nested.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Nested.txt
@@ -1,30 +1,30 @@
 package test
 
-public trait Nested : java.lang.Object {
-    
-    public trait Deeper1 : java.lang.Object {
-        
-        public trait Runnable : java.lang.Object {
+public trait Nested {
+
+    public trait Deeper1 {
+
+        public trait Runnable {
             public abstract fun run(): kotlin.Unit
             public abstract fun run2(): kotlin.Unit
         }
     }
-    
-    public trait Deeper2 : java.lang.Object {
-        
-        public trait Runnable : java.lang.Object {
+
+    public trait Deeper2 {
+
+        public trait Runnable {
             public abstract fun run(): kotlin.Unit
         }
     }
-    
-    public trait Runnable : java.lang.Object {
+
+    public trait Runnable {
         public abstract fun run(): kotlin.Unit
     }
 }
 
 package test.Nested {
     public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable
-    
+
     package test.Nested.Deeper2 {
         public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
     }
diff --git a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
index 15c4d1311ac..825a213b0b4 100644
--- a/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
 
-public trait Runnable : java.lang.Object {
+public trait Runnable {
     public abstract fun run(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
index d9d72e8ddd6..a7f6c72e9bd 100644
--- a/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
@@ -1,16 +1,16 @@
 package test
 
-public trait SamSubinterfaceOfTwo : java.lang.Object {
-    
+public trait SamSubinterfaceOfTwo {
+
     public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String?
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun f(): kotlin.CharSequence?
     }
-    
-    public trait Super2</*0*/ T> : java.lang.Object {
+
+    public trait Super2</*0*/ T> {
         public abstract fun f(): T?
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
index 9bc1fae75f1..212aae9bbb1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
@@ -2,6 +2,6 @@ package test
 
 public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.VarargParameter
 
-public trait VarargParameter : java.lang.Object {
+public trait VarargParameter {
     public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
index 3783065daca..49dd8522754 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class AmbiguousAdapters : java.lang.Object {
+public open class AmbiguousAdapters {
     public constructor AmbiguousAdapters()
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
index 5c95cc70b3e..545fb723273 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class Basic : java.lang.Object {
+public open class Basic {
     public constructor Basic()
     public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
index 29507dc5105..881c02934fd 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class Constructor : java.lang.Object {
+public open class Constructor {
     public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?)
     public constructor Constructor(/*0*/ p0: java.lang.Runnable?)
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
index ab5d2d09b77..0cb712d4f59 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait DeepSamLoop : java.lang.Object {
-    
-    public trait Bar : java.lang.Object {
+public trait DeepSamLoop {
+
+    public trait Bar {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): kotlin.Unit
     }
-    
-    public trait Foo : java.lang.Object {
+
+    public trait Foo {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
index 64296055194..c76f8c5a832 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NonTrivialFunctionType : java.lang.Object {
+public open class NonTrivialFunctionType {
     public constructor NonTrivialFunctionType()
     public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, kotlin.String) -> kotlin.Boolean)?): kotlin.Unit
     public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
index 8cfa6014ef4..5f303ce82c1 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
@@ -2,7 +2,7 @@ package test
 
 public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> kotlin.Unit): test.SelfAsParameter
 
-public trait SelfAsParameter : java.lang.Object {
+public trait SelfAsParameter {
     public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter?) -> kotlin.Unit)?): kotlin.Unit
     public abstract fun foo(/*0*/ p0: test.SelfAsParameter?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
index b1a07123052..53f649e6c28 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class SeveralSamParameters : java.lang.Object {
+public open class SeveralSamParameters {
     public constructor SeveralSamParameters()
 }
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
index c3b5265f231..284b3d8c747 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class TypeParameterOfClass</*0*/ T> : java.lang.Object {
+public open class TypeParameterOfClass</*0*/ T> {
     public constructor TypeParameterOfClass</*0*/ T>()
     public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
     public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
index 309c3cb0023..f567fbb2ac3 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class TypeParameterOfMethod : java.lang.Object {
+public open class TypeParameterOfMethod {
     public constructor TypeParameterOfMethod()
 }
 
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
index e2d97c50465..1fda8345520 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class TypeParameterOfOuterClass</*0*/ T> : java.lang.Object {
+public open class TypeParameterOfOuterClass</*0*/ T> {
     public constructor TypeParameterOfOuterClass</*0*/ T>()
-    
-    public open inner class Inner : java.lang.Object {
+
+    public open inner class Inner {
         public constructor Inner()
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
         public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
index 848f8a4ffec..bb3b0670979 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
-    
+public trait AdapterDoesntOverrideDeclaration {
+
     public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
index dde31a762ab..c0cbf63458a 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait InheritedAdapterAndDeclaration : java.lang.Object {
-    
+public trait InheritedAdapterAndDeclaration {
+
     public trait Sub : test.InheritedAdapterAndDeclaration.Super {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
index 655799b98dc..7970c379294 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
@@ -1,15 +1,15 @@
 package test
 
-public trait InheritedAmbiguousAdapters : java.lang.Object {
-    
+public trait InheritedAmbiguousAdapters {
+
     public trait Sub : test.InheritedAmbiguousAdapters.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
index eb1909c283d..d1126be6ee6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
@@ -1,15 +1,15 @@
 package test
 
-public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object {
-    
+public trait InheritedAndOverriddenAmbiguousAdapters {
+
     public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
index 3dd91b5d815..d2279264b80 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait InheritedOverridden : java.lang.Object {
-    
+public trait InheritedOverridden {
+
     public open class Sub : test.InheritedOverridden.Super {
         public constructor Sub()
         public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public open class Super : java.lang.Object {
+
+    public open class Super {
         public constructor Super()
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
index 31c035e356f..5f0950d43b6 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait InheritedOverriddenAdapter : java.lang.Object {
-    
+public trait InheritedOverriddenAdapter {
+
     public open class Sub : test.InheritedOverriddenAdapter.Super {
         public constructor Sub()
         public open override /*1*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public open class Super : java.lang.Object {
+
+    public open class Super {
         public constructor Super()
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
index c9dd78146ec..739ec23f05d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait InheritedSameAdapters : java.lang.Object {
-    
+public trait InheritedSameAdapters {
+
     public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
index db1cd5683e9..a7be8e55b7d 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
@@ -1,22 +1,22 @@
 package test
 
-public trait InheritedSameAdaptersWithSubstitution : java.lang.Object {
-    
+public trait InheritedSameAdaptersWithSubstitution {
+
     public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
         public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
         public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
     }
-    
-    public trait Super2</*0*/ T> : java.lang.Object {
+
+    public trait Super2</*0*/ T> {
         public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
     }
-    
+
     public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<kotlin.String> {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
index a7c180d9341..76d7dccbfd7 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritedSimple : java.lang.Object {
-    
+public trait InheritedSimple {
+
     public trait Sub : test.InheritedSimple.Super {
         public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
index de243610c17..6af72f2b45e 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait OverriddenAmbiguousAdapters : java.lang.Object {
-    
+public trait OverriddenAmbiguousAdapters {
+
     public trait Sub : test.OverriddenAmbiguousAdapters.Super {
         public abstract override /*2*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
         public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
index 11d229e6c45..561b37e5e9b 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait ArraysInSubtypes : java.lang.Object {
-    
+public trait ArraysInSubtypes {
+
     public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
         public abstract override /*1*/ fun array(): kotlin.Array<kotlin.String>?
         public abstract override /*1*/ fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.String>?>?
         public abstract override /*1*/ fun objArray(): kotlin.Array<T>?
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun array(): kotlin.Array<kotlin.CharSequence>?
         public abstract fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.CharSequence>?>?
         public abstract fun objArray(): kotlin.Array<kotlin.Any>?
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
index b650d9f6dcf..4cb1df88b88 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
@@ -1,11 +1,11 @@
 package test
 
-public trait MethodTypeParameterErased : java.lang.Object {
-    
-    public trait Bug</*0*/ T> : java.lang.Object {
+public trait MethodTypeParameterErased {
+
+    public trait Bug</*0*/ T> {
         public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
     }
-    
+
     public open class SubBug : test.MethodTypeParameterErased.Bug<kotlin.Any> {
         public constructor SubBug()
         public open fun save(): test.MethodTypeParameterErased.SubBug?
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
index 676b1e3e5a5..b5bf8d1e4f5 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
@@ -1,14 +1,14 @@
 package test
 
-public open class RawSuperType : java.lang.Object {
+public open class RawSuperType {
     public constructor RawSuperType()
-    
+
     public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
         public constructor Derived()
         public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
index cce2839dab5..ddd0d9d04d7 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
@@ -1,20 +1,20 @@
 package test
 
-public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
-    
+public trait ReturnInnerSubclassOfSupersInner {
+
     public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B> {
         public constructor Sub</*0*/ B>()
-        
+
         public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
             public/*package*/ constructor Inner()
             public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B>?
         }
     }
-    
-    public open class Super</*0*/ A> : java.lang.Object {
+
+    public open class Super</*0*/ A> {
         public constructor Super</*0*/ A>()
-        
-        public/*package*/ open inner class Inner : java.lang.Object {
+
+        public/*package*/ open inner class Inner {
             public/*package*/ constructor Inner()
             public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
         }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
index 1b8ae653e68..4a28207de12 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
@@ -1,7 +1,7 @@
 package test
 
-public trait SubclassWithRawType : java.lang.Object {
-    
+public trait SubclassWithRawType {
+
     public trait Sub : test.SubclassWithRawType.Super {
         public abstract override /*1*/ fun array1(): kotlin.Array<kotlin.List<kotlin.String?>>?
         public abstract override /*1*/ fun array2(): kotlin.Array<kotlin.List<kotlin.Any>>?
@@ -12,8 +12,8 @@ public trait SubclassWithRawType : java.lang.Object {
         public abstract override /*1*/ fun simple3(): kotlin.MutableList<out kotlin.Any>?
         public abstract override /*1*/ fun wildcard(): kotlin.MutableList<out kotlin.Any?>?
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun array1(): kotlin.Array<kotlin.List<kotlin.Any?>>?
         public abstract fun array2(): kotlin.Array<kotlin.List<kotlin.String>>?
         public abstract fun boundWildcard1(): kotlin.MutableList<out kotlin.List<kotlin.Any?>?>?
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
index 9da27950611..243480526f5 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
@@ -2,13 +2,13 @@ package test
 
 public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList<kotlin.String?>): test.TwoSuperclassesInconsistentGenericTypes
 
-public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
+public trait TwoSuperclassesInconsistentGenericTypes {
     public abstract fun foo(): kotlin.MutableList<kotlin.String?>
-    
-    public trait Other : java.lang.Object {
+
+    public trait Other {
         public abstract fun foo(): kotlin.MutableList<kotlin.String>?
     }
-    
+
     public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
         public constructor Sub()
         public open override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
index 10fedc1970e..01d00f38389 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
@@ -1,17 +1,17 @@
 package test
 
-public trait TwoSuperclassesVarargAndNot : java.lang.Object {
-    
+public trait TwoSuperclassesVarargAndNot {
+
     public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
index 65f9ba3ed3a..aee1eb7b456 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
@@ -1,17 +1,17 @@
 package test
 
-public open class DeeplyInnerClass : java.lang.Object {
+public open class DeeplyInnerClass {
     public constructor DeeplyInnerClass()
-    
-    public/*package*/ open inner class A : java.lang.Object {
+
+    public/*package*/ open inner class A {
         public/*package*/ constructor A()
         public/*package*/ open fun a(): kotlin.Unit
-        
-        public/*package*/ open inner class B : java.lang.Object {
+
+        public/*package*/ open inner class B {
             public/*package*/ constructor B()
             public/*package*/ open fun b(): kotlin.Unit
-            
-            public/*package*/ open inner class C : java.lang.Object {
+
+            public/*package*/ open inner class C {
                 public/*package*/ constructor C()
                 public/*package*/ open fun c(): kotlin.Unit
             }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
index e6d18bc6c6b..8585bb9fd22 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
@@ -1,21 +1,21 @@
 package test
 
-public open class DeeplyNestedStatic : java.lang.Object {
+public open class DeeplyNestedStatic {
     public constructor DeeplyNestedStatic()
-    
-    public open class Foo : java.lang.Object {
+
+    public open class Foo {
         public constructor Foo()
-        
-        public open class Bar : java.lang.Object {
+
+        public open class Bar {
             public constructor Bar()
         }
     }
 }
 
 package test.DeeplyNestedStatic {
-    
+
     package test.DeeplyNestedStatic.Foo {
-        
+
         package test.DeeplyNestedStatic.Foo.Bar {
             public open fun method(): kotlin.Unit
         }
diff --git a/compiler/testData/loadJava/compiledJava/static/Enum.txt b/compiler/testData/loadJava/compiledJava/static/Enum.txt
index ccff68ce313..819dbc1fcd0 100644
--- a/compiler/testData/loadJava/compiledJava/static/Enum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Enum.txt
@@ -4,56 +4,56 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
     private constructor Enum()
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    
+
     public class object <class-object-for-Enum> {
         private constructor <class-object-for-Enum>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.Enum
         public final /*synthesized*/ fun values(): kotlin.Array<test.Enum>
     }
-    
+
     public enum entry A : test.Enum {
         private constructor A()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-A> : test.Enum.A {
             private constructor <class-object-for-A>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
+
     public enum entry B : test.Enum {
         private constructor B()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-B> : test.Enum.B {
             private constructor <class-object-for-B>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
+
     public enum entry C : test.Enum {
         private constructor C()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-C> : test.Enum.C {
             private constructor <class-object-for-C>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
             public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
         }
     }
-    
-    public open inner class Inner : java.lang.Object {
+
+    public open inner class Inner {
         public constructor Inner()
         public/*package*/ open fun bar(): kotlin.Unit
         public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String?): kotlin.Unit
     }
-    
-    public open class Nested : java.lang.Object {
+
+    public open class Nested {
         public constructor Nested()
         public/*package*/ open fun foo(): kotlin.Unit
         public/*package*/ open fun values(): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
index f01a10e1b61..c90dcfa3c82 100644
--- a/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
+++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.txt
@@ -1,14 +1,14 @@
 package test
 
-public open class InnerClass : java.lang.Object {
+public open class InnerClass {
     public constructor InnerClass()
-    
-    public open inner class Inner : java.lang.Object {
+
+    public open inner class Inner {
         public constructor Inner()
         public open fun foo(): kotlin.Unit
     }
-    
-    public open class Nested : java.lang.Object {
+
+    public open class Nested {
         public constructor Nested()
         public open fun bar(): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.txt b/compiler/testData/loadJava/compiledJava/static/Simple.txt
index 3bf40d7c9a5..2acce6d38a5 100644
--- a/compiler/testData/loadJava/compiledJava/static/Simple.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Simple.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class Simple : java.lang.Object {
+public open class Simple {
     public constructor Simple()
     public open fun foo(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
index 5e30b50072f..16d4403ba44 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class StaticFinal : java.lang.Object {
+public open class StaticFinal {
     public constructor StaticFinal()
 }
 
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
index d87f7b96d99..d8f355694d3 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
@@ -4,18 +4,18 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
     private constructor StaticMembersInEnum()
     public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
     public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-    
+
     public class object <class-object-for-StaticMembersInEnum> {
         private constructor <class-object-for-StaticMembersInEnum>()
         public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum
         public final /*synthesized*/ fun values(): kotlin.Array<test.StaticMembersInEnum>
     }
-    
+
     public enum entry ENTRY : test.StaticMembersInEnum {
         private constructor ENTRY()
         public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
         public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
-        
+
         public class object <class-object-for-ENTRY> : test.StaticMembersInEnum.ENTRY {
             private constructor <class-object-for-ENTRY>()
             public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt b/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt
index 972f74760a0..6d03dbf4edd 100644
--- a/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt
+++ b/compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt
@@ -3,7 +3,7 @@ package test
 public /*synthesized*/ fun SamInterface(/*0*/ function: () -> kotlin.Unit): test.SamInterface
 public fun topLevelFunction(): kotlin.Unit
 
-public open class JavaClass : java.lang.Object {
+public open class JavaClass {
     public constructor JavaClass()
     public open fun instanceMethod(): kotlin.Unit
 }
@@ -12,7 +12,7 @@ public final class KotlinClass {
     public constructor KotlinClass()
 }
 
-public trait SamInterface : java.lang.Object {
+public trait SamInterface {
     public abstract fun instanceMethod(): kotlin.Unit
 }
 
@@ -21,12 +21,12 @@ package test.JavaClass {
 }
 
 package test.sub {
-    
-    public open class JavaClassInSubpackage : java.lang.Object {
+
+    public open class JavaClassInSubpackage {
         public constructor JavaClassInSubpackage()
         public open fun instanceMethod(): kotlin.Unit
     }
-    
+
     package test.sub.JavaClassInSubpackage {
         public open fun staticMethod(): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt
index 54089f097d4..c0b70fe9606 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.kt
@@ -1,6 +1,6 @@
 package test
 
-public class ArrayTypeVariance : java.lang.Object() {
+public class ArrayTypeVariance {
     public fun toArray(p0: Array<out Any>?): Array<Any>? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt
index 6a6b8115171..b898af6ef42 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ArrayTypeVariance.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class ArrayTypeVariance : java.lang.Object {
+public final class ArrayTypeVariance {
     public constructor ArrayTypeVariance()
     public final fun toArray(/*0*/ p0: kotlin.Array<out kotlin.Any>?): kotlin.Array<kotlin.Any>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.kt
index 50f79015519..6f32756c134 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.kt
@@ -1,6 +1,6 @@
 package test
 
-public class ClassWithConstVal() : java.lang.Object() {
+public class ClassWithConstVal() {
     public val f: Int = 1
     public val f2: Int = f
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.txt
index 99c1103a2e2..383720d408e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithConstVal.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class ClassWithConstVal : java.lang.Object {
+public final class ClassWithConstVal {
     public constructor ClassWithConstVal()
     public final val f: kotlin.Int = 1
     public final val f2: kotlin.Int = 1
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt
index 6a103ab234c..80fdf100950 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.kt
@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypeP<P>() : java.lang.Object() {
+public class ClassWithTypeP<P>() {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.txt
index 062e4b8f5be..d210d16c87d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypeP.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypeP</*0*/ P> : java.lang.Object {
+public final class ClassWithTypeP</*0*/ P> {
     public constructor ClassWithTypeP</*0*/ P>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt
index cedbf9582a8..71417b248ce 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.kt
@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePP<P, Q : P>() : java.lang.Object() {
+public class ClassWithTypePP<P, Q : P>() {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.txt
index d0c104b4ca3..33e6ddc2ff0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePP.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> : java.lang.Object {
+public final class ClassWithTypePP</*0*/ P, /*1*/ Q : P> {
     public constructor ClassWithTypePP</*0*/ P, /*1*/ Q : P>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt
index 153bf75a30e..0fbab33c036 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ClassWithTypePRefNext<R : kotlin.Iterable<P>?, P>() : java.lang.Object()
+public open class ClassWithTypePRefNext<R : kotlin.Iterable<P>?, P>()
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt
index 90a1afc7fa8..e669b40ca24 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefNext.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P> : java.lang.Object {
+public open class ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P> {
     public constructor ClassWithTypePRefNext</*0*/ R : kotlin.Iterable<P>?, /*1*/ P>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt
index a8976a5d089..60aeb37c85f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.kt
@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePRefSelf<P : kotlin.Enum<P>?>() : java.lang.Object() {
+public class ClassWithTypePRefSelf<P : kotlin.Enum<P>?>() {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt
index b90a5a7a0ae..c67b604967c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelf.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?> : java.lang.Object {
+public final class ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?> {
     public constructor ClassWithTypePRefSelf</*0*/ P : kotlin.Enum<P>?>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt
index e0683f8b51a..70395212d94 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.kt
@@ -1,4 +1,4 @@
 package test
 
-public class ClassWithTypePRefSelfAndClass<P: ClassWithTypePRefSelfAndClass<P>?>(): Object() {
+public class ClassWithTypePRefSelfAndClass<P: ClassWithTypePRefSelfAndClass<P>?>() {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.txt
index 1c2bb118bad..dbf9c522d2b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/ClassWithTypePRefSelfAndClass.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?> : java.lang.Object {
+public final class ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?> {
     public constructor ClassWithTypePRefSelfAndClass</*0*/ P : test.ClassWithTypePRefSelfAndClass<P>?>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt
index 32007528faf..0d9f82d2a3e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.kt
@@ -1,5 +1,5 @@
 package test
 
-public class FieldAsVar() : java.lang.Object() {
+public class FieldAsVar() {
     public var f: Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt
index e26e6f8a219..7cc3799837e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldAsVar.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class FieldAsVar : java.lang.Object {
+public final class FieldAsVar {
     public constructor FieldAsVar()
     public final var f: kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt
index 8b4d9da67bf..b6a07983f19 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class FieldOfArrayType() : java.lang.Object() {
+public open class FieldOfArrayType() {
     public var files: Array<java.io.File>? = null
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt
index 7b1f2c69b6e..d7cf2d40ff7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FieldOfArrayType.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class FieldOfArrayType : java.lang.Object {
+public open class FieldOfArrayType {
     public constructor FieldOfArrayType()
     public final var files: kotlin.Array<java.io.File>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt
index 741f9302aeb..1e0d39d9b2d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.kt
@@ -1,6 +1,6 @@
 //ALLOW_AST_ACCESS
 package test
 
-public class FinalFieldAsVal() : java.lang.Object() {
+public class FinalFieldAsVal() {
     public val f: Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt
index ebc1dbeae9a..5e0eb8b96b6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/FinalFieldAsVal.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class FinalFieldAsVal : java.lang.Object {
+public final class FinalFieldAsVal {
     public constructor FinalFieldAsVal()
     public final val f: kotlin.Int = 1
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.kt
index e291a385068..83aa1ea2273 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.kt
@@ -1,12 +1,12 @@
 package test
 
-public class InheritMethodsDifferentReturnTypes: Object() {
-    public trait Super1: Object {
+public class InheritMethodsDifferentReturnTypes {
+    public trait Super1 {
         public fun foo(): CharSequence?
         public fun bar(): String?
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): String?
         public fun bar(): CharSequence?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt
index 54d6c8bfa97..da364eee10f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypes.txt
@@ -1,19 +1,19 @@
 package test
 
-public final class InheritMethodsDifferentReturnTypes : java.lang.Object {
+public final class InheritMethodsDifferentReturnTypes {
     public constructor InheritMethodsDifferentReturnTypes()
-    
+
     public trait Sub : test.InheritMethodsDifferentReturnTypes.Super1, test.InheritMethodsDifferentReturnTypes.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String?
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun bar(): kotlin.String?
         public abstract fun foo(): kotlin.CharSequence?
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun bar(): kotlin.CharSequence?
         public abstract fun foo(): kotlin.String?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.kt
index 4d5f479f891..47c847a1c67 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.kt
@@ -1,12 +1,12 @@
 package test
 
-public class InheritMethodsDifferentReturnTypesGeneric: Object() {
-    public trait Super1<F, B>: Object {
+public class InheritMethodsDifferentReturnTypesGeneric {
+    public trait Super1<F, B> {
         public fun foo(): F?
         public fun bar(): B?
     }
 
-    public trait Super2<FF, BB>: Object {
+    public trait Super2<FF, BB> {
         public fun foo(): FF?
         public fun bar(): BB?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt
index 1d806f33770..25c075d6460 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -1,19 +1,19 @@
 package test
 
-public final class InheritMethodsDifferentReturnTypesGeneric : java.lang.Object {
+public final class InheritMethodsDifferentReturnTypesGeneric {
     public constructor InheritMethodsDifferentReturnTypesGeneric()
-    
+
     public trait Sub : test.InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin.String, kotlin.CharSequence>, test.InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin.CharSequence, kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun bar(): kotlin.String?
         public abstract override /*2*/ /*fake_override*/ fun foo(): kotlin.String?
     }
-    
-    public trait Super1</*0*/ F, /*1*/ B> : java.lang.Object {
+
+    public trait Super1</*0*/ F, /*1*/ B> {
         public abstract fun bar(): B?
         public abstract fun foo(): F?
     }
-    
-    public trait Super2</*0*/ FF, /*1*/ BB> : java.lang.Object {
+
+    public trait Super2</*0*/ FF, /*1*/ BB> {
         public abstract fun bar(): BB?
         public abstract fun foo(): FF?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt
index 011c3c16d8e..fd54c3b8374 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class InnerClass() : java.lang.Object() {
-    public inner open class Inner() : java.lang.Object()
+public open class InnerClass() {
+    public inner open class Inner()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.txt
index 805d56912cb..7ff7234c27f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClass.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class InnerClass : java.lang.Object {
+public open class InnerClass {
     public constructor InnerClass()
-    
-    public open inner class Inner : java.lang.Object {
+
+    public open inner class Inner {
         public constructor Inner()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt
index 77ac37f6dbf..83a4eb08ec9 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class InnerClassReferencesOuterTP<P>() : java.lang.Object() {
-    public open inner class Inner<Q : P>() : java.lang.Object()
+public open class InnerClassReferencesOuterTP<P>() {
+    public open inner class Inner<Q : P>()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.txt
index b6468974d9c..f1219495721 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassReferencesOuterTP.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class InnerClassReferencesOuterTP</*0*/ P> : java.lang.Object {
+public open class InnerClassReferencesOuterTP</*0*/ P> {
     public constructor InnerClassReferencesOuterTP</*0*/ P>()
-    
-    public open inner class Inner</*0*/ Q : P> : java.lang.Object {
+
+    public open inner class Inner</*0*/ Q : P> {
         public constructor Inner</*0*/ Q : P>()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt
index 2ad6c40437b..4217681a8df 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.kt
@@ -1,7 +1,7 @@
 package test
 
-public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
-    public open inner class Inner() : java.lang.Object() {
+public open class InnerClassesInGeneric<P, Q>() {
+    public open inner class Inner() {
     }
     
     public open inner class Inner2() : Inner() {
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt
index 56f18a212bf..2f7fcc1e51b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/InnerClassesInGeneric.txt
@@ -1,12 +1,12 @@
 package test
 
-public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> : java.lang.Object {
+public open class InnerClassesInGeneric</*0*/ P, /*1*/ Q> {
     public constructor InnerClassesInGeneric</*0*/ P, /*1*/ Q>()
-    
-    public open inner class Inner : java.lang.Object {
+
+    public open inner class Inner {
         public constructor Inner()
     }
-    
+
     public open inner class Inner2 : test.InnerClassesInGeneric.Inner {
         public constructor Inner2()
         public open fun iterator(): kotlin.MutableIterator<P>?
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.kt
index 6d86a53b695..0f8d57dfaf1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.kt
@@ -1,7 +1,7 @@
 package test
 
-public class MethodReferencesOuterClassTP<P>() : java.lang.Object() {
-    public inner class Inner() : java.lang.Object() {
+public class MethodReferencesOuterClassTP<P>() {
+    public inner class Inner() {
         public fun f<Q : P>() {}
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
index d9b0259967f..24fe42c95d0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodReferencesOuterClassTP.txt
@@ -1,9 +1,9 @@
 package test
 
-public final class MethodReferencesOuterClassTP</*0*/ P> : java.lang.Object {
+public final class MethodReferencesOuterClassTP</*0*/ P> {
     public constructor MethodReferencesOuterClassTP</*0*/ P>()
-    
-    public final inner class Inner : java.lang.Object {
+
+    public final inner class Inner {
         public constructor Inner()
         public final fun </*0*/ Q : P> f(): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.kt
index 2d0e909abfc..e14a6aab1f2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class MethodTypePOneUpperBound() : java.lang.Object() {
+public open class MethodTypePOneUpperBound() {
     public open fun <T : Cloneable?> bar() : Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
index 5e65b8202b5..e16b6d36e18 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePOneUpperBound.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodTypePOneUpperBound : java.lang.Object {
+public open class MethodTypePOneUpperBound {
     public constructor MethodTypePOneUpperBound()
     public open fun </*0*/ T : java.lang.Cloneable?> bar(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.kt
index 63a9e56ce05..23cec6f3a48 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodTypePTwoUpperBounds() : java.lang.Object() {
+public open class MethodTypePTwoUpperBounds() {
     public open fun <T> foo(): Unit where T : Cloneable?, T : Runnable? {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
index 2bfbc882910..da9a0129e27 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodTypePTwoUpperBounds.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodTypePTwoUpperBounds : java.lang.Object {
+public open class MethodTypePTwoUpperBounds {
     public constructor MethodTypePTwoUpperBounds()
     public open fun </*0*/ T : java.lang.Cloneable?> foo(): kotlin.Unit where T : java.lang.Runnable?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.kt
index 0a120a659e2..6969cf5f806 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.kt
@@ -1,5 +1,5 @@
 package test
 
-public class MethodWithTypeP() : java.lang.Object() {
+public class MethodWithTypeP() {
     public fun <P> f() : Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
index 2aae33107cb..05849efead9 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypeP.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class MethodWithTypeP : java.lang.Object {
+public final class MethodWithTypeP {
     public constructor MethodWithTypeP()
     public final fun </*0*/ P> f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.kt
index 7fb1ba2839a..5dc5e05155e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.kt
@@ -1,5 +1,5 @@
 package test
 
-public class MethodWithTypePP() : java.lang.Object() {
+public class MethodWithTypePP() {
     public fun <P, Q : P> f() : Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
index 2afcccfa658..043d7ad44f5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePP.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class MethodWithTypePP : java.lang.Object {
+public final class MethodWithTypePP {
     public constructor MethodWithTypePP()
     public final fun </*0*/ P, /*1*/ Q : P> f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.kt
index a0a6ee37de3..bfb32ca0077 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+public open class MethodWithTypePRefClassP<P>() {
     public fun <Q : P> f() : Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
index 1d867c941e0..a1f6e8b1888 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethodWithTypePRefClassP.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithTypePRefClassP</*0*/ P> : java.lang.Object {
+public open class MethodWithTypePRefClassP</*0*/ P> {
     public constructor MethodWithTypePRefClassP</*0*/ P>()
     public final fun </*0*/ Q : P> f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.kt
index fce8538f540..46c552f1044 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.kt
@@ -1,5 +1,5 @@
 package test
 
-public final class MethosWithPRefTP() : java.lang.Object() {
+public final class MethosWithPRefTP() {
     public fun <P> f(p0: P?) : Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
index 95362596565..54e29bd7bc1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MethosWithPRefTP.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class MethosWithPRefTP : java.lang.Object {
+public final class MethosWithPRefTP {
     public constructor MethosWithPRefTP()
     public final fun </*0*/ P> f(/*0*/ p0: P?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.kt
index 8ab0457d139..88102a669f9 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class MyException(p0: String?, p1: Throwable?) : java.lang.Object()
+public open class MyException(p0: String?, p1: Throwable?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt
index 503e865981a..2eda281a3e4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/MyException.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class MyException : java.lang.Object {
+public open class MyException {
     public constructor MyException(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.Throwable?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.kt
index 6d90310a9ce..4d11946f8c3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class NestedClass() : java.lang.Object() {
-    public open class Nested() : java.lang.Object()
+public open class NestedClass() {
+    public open class Nested()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.txt
index 04335e91d8e..541987ba206 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/NestedClass.txt
@@ -1,9 +1,9 @@
 package test
 
-public open class NestedClass : java.lang.Object {
+public open class NestedClass {
     public constructor NestedClass()
-    
-    public open class Nested : java.lang.Object {
+
+    public open class Nested {
         public constructor Nested()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.kt
index f5123ccdeb8..a30fb2d2fd4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.kt
@@ -1,6 +1,6 @@
 package test
 
-public trait RemoveRedundantProjectionKind: Object {
+public trait RemoveRedundantProjectionKind {
     public fun f(p0: Collection<CharSequence?>?)
     public fun f(p0: Comparable<CharSequence?>?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
index 6f3f7dec7e7..781405bde80 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait RemoveRedundantProjectionKind : java.lang.Object {
+public trait RemoveRedundantProjectionKind {
     public abstract fun f(/*0*/ p0: kotlin.Collection<kotlin.CharSequence?>?): kotlin.Unit
     public abstract fun f(/*0*/ p0: kotlin.Comparable<kotlin.CharSequence?>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.kt
index 142307e5b5a..67ddfe535e6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.kt
@@ -1,3 +1,3 @@
 package test
 
-public class Simple() : java.lang.Object()
+public class Simple()
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.txt
index cc0a52039b1..68d64bc8da2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/Simple.txt
@@ -1,5 +1,5 @@
 package test
 
-public final class Simple : java.lang.Object {
+public final class Simple {
     public constructor Simple()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.kt
index 8ceb5f11990..ea277c3f44a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.kt
@@ -1,6 +1,6 @@
 package test
 
-public class TwoFields() : java.lang.Object() {
+public class TwoFields() {
     public var a: Int = 1
     public var b: Short = 2;
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt
index e63e8834685..3219f7b614a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/TwoFields.txt
@@ -1,6 +1,6 @@
 package test
 
-public final class TwoFields : java.lang.Object {
+public final class TwoFields {
     public constructor TwoFields()
     public final var a: kotlin.Int
     public final var b: kotlin.Short
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.kt
index 5e7930dd54b..8aa3de94956 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.kt
@@ -1,7 +1,7 @@
 package test
 
-public final class UnboundWildcard: Object() {
+public final class UnboundWildcard {
     public final fun foo(): MyClass<*>? = throw UnsupportedOperationException()
 
-    public trait MyClass<T: CharSequence?>: Object
+    public trait MyClass<T: CharSequence?>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt
index b844879192d..78e27a08e43 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/UnboundWildcard.txt
@@ -1,9 +1,9 @@
 package test
 
-public final class UnboundWildcard : java.lang.Object {
+public final class UnboundWildcard {
     public constructor UnboundWildcard()
     public final fun foo(): test.UnboundWildcard.MyClass<out kotlin.CharSequence?>?
-    
-    public trait MyClass</*0*/ T : kotlin.CharSequence?> : java.lang.Object {
+
+    public trait MyClass</*0*/ T : kotlin.CharSequence?> {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.kt
index facb7f41ffc..6a2494f2599 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.kt
@@ -1,6 +1,6 @@
 //ALLOW_AST_ACCESS
 package test
 
-public open class AnnotatedMethod() : java.lang.Object() {
+public open class AnnotatedMethod() {
     public open deprecated("Deprecated in Java") fun f(): Unit { }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
index 5e05bb75e97..8590bec62e7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/annotation/AnnotatedMethod.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class AnnotatedMethod : java.lang.Object {
+public open class AnnotatedMethod {
     public constructor AnnotatedMethod()
     kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open fun f(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.kt
index 3cf6e78927a..58f227b3248 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?) : java.lang.Object()
+public open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt
index 52772056d1e..69ed3a980f8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericDeep.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorGenericDeep : java.lang.Object {
+public open class ConstructorGenericDeep {
     public constructor ConstructorGenericDeep(/*0*/ p0: java.lang.Class<kotlin.Any?>?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.kt
index c29b0b8c2ec..147bfc44e80 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ConstructorGenericSimple(p0: Any?) : java.lang.Object()
+public open class ConstructorGenericSimple(p0: Any?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt
index d7ac74fb4f1..23fc47a52db 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericSimple.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorGenericSimple : java.lang.Object {
+public open class ConstructorGenericSimple {
     public constructor ConstructorGenericSimple(/*0*/ p0: kotlin.Any?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.kt
index 1641ed20277..6ca4f534ed8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.kt
@@ -1,3 +1,3 @@
 package test
 
-public open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?) : java.lang.Object()
+public open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.txt
index 7dd933c0d29..11b0af66f1b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/constructor/ConstructorGenericUpperBound.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorGenericUpperBound : java.lang.Object {
+public open class ConstructorGenericUpperBound {
     public constructor ConstructorGenericUpperBound(/*0*/ p0: java.util.RandomAccess?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.kt
index 2cf5614c969..c3af2c55942 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class DifferentGetterAndSetter() : java.lang.Object() {
+public open class DifferentGetterAndSetter() {
     public open fun setSomething(p0: String?): Unit { }
     public open fun getSomething() : Int = 17
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
index 178b8e76be6..e570edbeaf4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/DifferentGetterAndSetter.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class DifferentGetterAndSetter : java.lang.Object {
+public open class DifferentGetterAndSetter {
     public constructor DifferentGetterAndSetter()
     public open fun getSomething(): kotlin.Int
     public open fun setSomething(/*0*/ p0: kotlin.String?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.kt
index c2b29954388..c973107933b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.kt
@@ -1,6 +1,6 @@
 package test
 
-public trait JavaBeanAbstractGetter : java.lang.Object {
+public trait JavaBeanAbstractGetter {
     //final val red: Int
     public abstract fun getRed(): Int
     //final val blue: Int
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt
index d286a41d8d6..597adaea6c9 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanAbstractGetter.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait JavaBeanAbstractGetter : java.lang.Object {
+public trait JavaBeanAbstractGetter {
     public abstract fun getBlue(): kotlin.Int
     public abstract fun getRed(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.kt
index 0651c65bda0..d48f024e3ea 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class JavaBeanVal() : java.lang.Object() {
+public open class JavaBeanVal() {
     public open fun getColor(): String? = ""
     //val color: String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt
index 3e4d91c9043..81ec3ce6694 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVal.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class JavaBeanVal : java.lang.Object {
+public open class JavaBeanVal {
     public constructor JavaBeanVal()
     public open fun getColor(): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.kt
index 9838ee6c865..c94591530ae 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class JavaBeanVar() : java.lang.Object() {
+public open class JavaBeanVar() {
     public open fun getColor(): String? = ""
     public open fun setColor(p0: String?): Unit { }
     //var color: String? = ""
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
index 97bb96b8990..814c9028cdf 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVar.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class JavaBeanVar : java.lang.Object {
+public open class JavaBeanVar {
     public constructor JavaBeanVar()
     public open fun getColor(): kotlin.String?
     public open fun setColor(/*0*/ p0: kotlin.String?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.kt
index 7bdb8a1833e..0e7a9952e7c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.ArrayList
 
-public open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
+public open class JavaBeanVarOfGenericType<P>() {
     public open fun getCharacters(): ArrayList<P>? = null
     public open fun setCharacters(p0: ArrayList<P>?) { }
     //var characters: ArrayList<P>? = null
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
index d03826286bc..9ffd7cb5a7a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class JavaBeanVarOfGenericType</*0*/ P> : java.lang.Object {
+public open class JavaBeanVarOfGenericType</*0*/ P> {
     public constructor JavaBeanVarOfGenericType</*0*/ P>()
     public open fun getCharacters(): java.util.ArrayList<P>?
     public open fun setCharacters(/*0*/ p0: java.util.ArrayList<P>?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.kt
index b2a8d472b44..30a111a6a36 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class TwoSetters() : java.lang.Object() {
+public open class TwoSetters() {
     public open fun setSize(p0: String?) { }
     public open fun setSize(p0: Int) { }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
index e0d43de2917..b8b2656d434 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/javaBean/TwoSetters.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class TwoSetters : java.lang.Object {
+public open class TwoSetters {
     public constructor TwoSetters()
     public open fun setSize(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open fun setSize(/*0*/ p0: kotlin.String?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.kt
index ed3f2f39049..1b2faa5e906 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.kt
@@ -2,7 +2,7 @@ package test
 
 import java.io.Serializable
 
-public open class AllBoundsInWhen : Object() {
+public open class AllBoundsInWhen {
     public open fun <T> foo() where T: Serializable {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.txt
index 07d3750d448..d8f10af5b30 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/AllBoundsInWhen.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class AllBoundsInWhen : java.lang.Object {
+public open class AllBoundsInWhen {
     public constructor AllBoundsInWhen()
     public open fun </*0*/ T : java.io.Serializable> foo(): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.kt
index 34267f03e29..4bd8b3927dd 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class ArrayType : Object() {
+public open class ArrayType {
     public open fun foo(): Array<String> {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt
index 5f68ba06d8e..7c0828582db 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ArrayType.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ArrayType : java.lang.Object {
+public open class ArrayType {
     public constructor ArrayType()
     public open fun foo(): kotlin.Array<kotlin.String>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt
index 2f06b98bb52..904a0ec4c25 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.kt
@@ -1,4 +1,4 @@
 package test
 
-public open class ConstructorWithNewTypeParams<T>(first : Any) : java.lang.Object() {
+public open class ConstructorWithNewTypeParams<T>(first : Any) {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt
index 3c7677c18ba..bbb416ee3f7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorWithNewTypeParams</*0*/ T> : java.lang.Object {
+public open class ConstructorWithNewTypeParams</*0*/ T> {
     public constructor ConstructorWithNewTypeParams</*0*/ T>(/*0*/ first: kotlin.Any)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt
index 1fe4dd5b627..504b3e11edf 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.kt
@@ -1,4 +1,4 @@
 package test
 
-public open class ConstructorWithParentTypeParams<T>(first : T) : java.lang.Object() {
+public open class ConstructorWithParentTypeParams<T>(first : T) {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.txt
index bf5c904b34a..6482ade12d5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorWithParentTypeParams</*0*/ T> : java.lang.Object {
+public open class ConstructorWithParentTypeParams</*0*/ T> {
     public constructor ConstructorWithParentTypeParams</*0*/ T>(/*0*/ first: T)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt
index fef3d794602..7774aaa910f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.kt
@@ -2,5 +2,5 @@ package test
 
 import java.util.*
 
-public open class ConstructorWithSeveralParams(integer: Int, intField : Int, collection : ArrayList<String>) : java.lang.Object() {
+public open class ConstructorWithSeveralParams(integer: Int, intField : Int, collection : ArrayList<String>) {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt
index 5d0d19aef2e..487ad343567 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithSeveralParams.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorWithSeveralParams : java.lang.Object {
+public open class ConstructorWithSeveralParams {
     public constructor ConstructorWithSeveralParams(/*0*/ integer: kotlin.Int, /*1*/ intField: kotlin.Int, /*2*/ collection: java.util.ArrayList<kotlin.String>)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt
index dc9e910fbbe..9d3fe2bfd07 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.kt
@@ -1,4 +1,4 @@
 package test
 
-public open class ConstructorWithoutParams() : java.lang.Object() {
+public open class ConstructorWithoutParams() {
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.txt
index 1e6607ba698..362255d8ac3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/ConstructorWithoutParams.txt
@@ -1,5 +1,5 @@
 package test
 
-public open class ConstructorWithoutParams : java.lang.Object {
+public open class ConstructorWithoutParams {
     public constructor ConstructorWithoutParams()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.kt
index c9994aa65e9..89fbd544e8e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class CustomProjectionKind : Object() {
+public open class CustomProjectionKind {
     public open fun foo() : MutableList<out Number> = throw UnsupportedOperationException()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt
index 7fcac2beb44..a95a2a7b497 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/CustomProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class CustomProjectionKind : java.lang.Object {
+public open class CustomProjectionKind {
     public constructor CustomProjectionKind()
     public open fun foo(): kotlin.MutableList<out kotlin.Number>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt
index d210aac1a31..b3b4e068035 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class MethodWithFunctionTypes : Object() {
+public open class MethodWithFunctionTypes {
     public open fun foo(f : (String?) -> String) : (String.() -> String?)? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt
index e6fe5511522..93969487f08 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithFunctionTypes : java.lang.Object {
+public open class MethodWithFunctionTypes {
     public constructor MethodWithFunctionTypes()
     public open fun foo(/*0*/ f: (kotlin.String?) -> kotlin.String): (kotlin.String.() -> kotlin.String?)?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt
index 8b2128d8fad..c36584ea364 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class MethodWithGenerics : Object() {
+public open class MethodWithGenerics {
     public open fun foo(a : String, b : List<Map.Entry<String?, String>?>) : String = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt
index aa2f4dce103..29558a7afd2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithGenerics.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithGenerics : java.lang.Object {
+public open class MethodWithGenerics {
     public constructor MethodWithGenerics()
     public open fun foo(/*0*/ a: kotlin.String, /*1*/ b: kotlin.List<kotlin.Map.Entry<kotlin.String?, kotlin.String>?>): kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt
index 60565b96e08..4aec1323211 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class MethodWithMappedClasses : Object() {
+public open class MethodWithMappedClasses {
     public open fun <T> copy(dest : MutableList<in T>, src : List<T>) {}
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
index 92a8bb78a5a..930ccd62f22 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithMappedClasses.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithMappedClasses : java.lang.Object {
+public open class MethodWithMappedClasses {
     public constructor MethodWithMappedClasses()
     public open fun </*0*/ T> copy(/*0*/ dest: kotlin.MutableList<in T>, /*1*/ src: kotlin.List<T>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt
index 73670c2daff..8aac7621a36 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class MethodWithTypeParameters : Object() {
+public open class MethodWithTypeParameters {
     public open fun <A, B : Runnable> foo(a : A, b : List<B>, c: MutableList<in String?>) where B : List<Cloneable> {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
index 8c1f93ed7f5..f5426a90bb6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithTypeParameters : java.lang.Object {
+public open class MethodWithTypeParameters {
     public constructor MethodWithTypeParameters()
     public open fun </*0*/ A, /*1*/ B : java.lang.Runnable> foo(/*0*/ a: A, /*1*/ b: kotlin.List<B>, /*2*/ c: kotlin.MutableList<in kotlin.String?>): kotlin.Unit where B : kotlin.List<java.lang.Cloneable>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt
index e59f8963dcc..6722dd05531 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class MethodWithVararg : Object() {
+public open class MethodWithVararg {
     public open fun foo(vararg s : String) {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
index fbd935426ce..eccb281f565 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/MethodWithVararg.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MethodWithVararg : java.lang.Object {
+public open class MethodWithVararg {
     public constructor MethodWithVararg()
     public open fun foo(/*0*/ vararg s: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.kt
index ee6898c1ca3..723afdb903a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class PropertyArrayTypes<T>() : java.lang.Object() {
+public open class PropertyArrayTypes<T>() {
   public var arrayOfArrays : Array<Array<String>> = null!!
   public var array : Array<String> = null!!
   public var genericArray : Array<T> = null!!
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt
index cb91eb4e74b..497fb3a6c22 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyArrayTypes.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class PropertyArrayTypes</*0*/ T> : java.lang.Object {
+public open class PropertyArrayTypes</*0*/ T> {
     public constructor PropertyArrayTypes</*0*/ T>()
     public final var array: kotlin.Array<kotlin.String>
     public final var arrayOfArrays: kotlin.Array<kotlin.Array<kotlin.String>>
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.kt
index d50a725eb14..58cfa7d1717 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class PropertyComplexTypes<T>() : java.lang.Object() {
+public open class PropertyComplexTypes<T>() {
   public var genericType : T = null!!
   public var listDefinedGeneric : ArrayList<String> = null!!
   public var listGeneric : ArrayList<T> = null!!
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt
index 3e25f3390f8..4f36a168d29 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertyComplexTypes.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class PropertyComplexTypes</*0*/ T> : java.lang.Object {
+public open class PropertyComplexTypes</*0*/ T> {
     public constructor PropertyComplexTypes</*0*/ T>()
     public final var genericType: T
     public final var listDefinedGeneric: java.util.ArrayList<kotlin.String>
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.kt
index ac258b34506..ae169117d61 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class PropertySimpleType : java.lang.Object() {
+public open class PropertySimpleType {
   public var fieldOne : String = ""
   public var fieldTwo : String? = null
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt
index ac7b8ed5eaf..9d46a26b651 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/PropertySimpleType.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class PropertySimpleType : java.lang.Object {
+public open class PropertySimpleType {
     public constructor PropertySimpleType()
     public final var fieldOne: kotlin.String
     public final var fieldTwo: kotlin.String?
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.kt
index 9d45bb6c1a9..3277572e158 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.kt
@@ -1,7 +1,7 @@
 package test
 
-public final class StarProjection: Object() {
+public final class StarProjection {
     public final fun foo(): MyClass<*> = throw UnsupportedOperationException()
 
-    public trait MyClass<T: CharSequence?>: Object
+    public trait MyClass<T: CharSequence?>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt
index f3e06d90aa1..bcc24db07f5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/StarProjection.txt
@@ -1,9 +1,9 @@
 package test
 
-public final class StarProjection : java.lang.Object {
+public final class StarProjection {
     public constructor StarProjection()
     public final fun foo(): test.StarProjection.MyClass<out kotlin.CharSequence?>
-    
-    public trait MyClass</*0*/ T : kotlin.CharSequence?> : java.lang.Object {
+
+    public trait MyClass</*0*/ T : kotlin.CharSequence?> {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt
index 0cbe94c078b..6b8055c7080 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class AddingNullability : Object() {
+public open class AddingNullability {
     public open fun foo() : Int {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt
index 21134c09559..d673339d6c7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/AddingNullability.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class AddingNullability : java.lang.Object {
+public open class AddingNullability {
     public constructor AddingNullability()
     public open fun foo(): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.kt
index b9fbbcd766b..e3ff921edcd 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class ConflictingProjectionKind : Object() {
+public open class ConflictingProjectionKind {
     public open fun foo(p0: List<Number>?) {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
index bb84b122c4c..ab55ed672e6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ConflictingProjectionKind : java.lang.Object {
+public open class ConflictingProjectionKind {
     public constructor ConflictingProjectionKind()
     public open fun foo(/*0*/ p0: kotlin.List<kotlin.Number>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt
index 3efc998fc56..2345a3e5c63 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class ExplicitFieldGettersAndSetters : Object() {
+public open class ExplicitFieldGettersAndSetters {
     public var foo : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 5ec7d3e9ade..b18fd0c8f41 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ExplicitFieldGettersAndSetters : java.lang.Object {
+public open class ExplicitFieldGettersAndSetters {
     public constructor ExplicitFieldGettersAndSetters()
     public final var foo: kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.kt
index f254cca20bd..a13453e36c1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class ExtraUpperBound : Object() {
+public open class ExtraUpperBound {
     public open fun <A : Runnable?> foo() : String? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt
index 7561ad865cb..ae09dbde2a8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ExtraUpperBound : java.lang.Object {
+public open class ExtraUpperBound {
     public constructor ExtraUpperBound()
     public open fun </*0*/ A : java.lang.Runnable?> foo(): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.kt
index 60b9a7b62ab..8a59c58187d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class MissingUpperBound : Object() {
+public open class MissingUpperBound {
     public open fun <A : Runnable?> foo() : String? where A : Cloneable? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt
index 09d9f125dde..000e64ee276 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/MissingUpperBound.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class MissingUpperBound : java.lang.Object {
+public open class MissingUpperBound {
     public constructor MissingUpperBound()
     public open fun </*0*/ A : java.lang.Runnable?> foo(): kotlin.String? where A : java.lang.Cloneable?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.kt
index 132aeee7af1..208f7116485 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class NoFieldTypeRef : Object() {
+public open class NoFieldTypeRef {
     public var foo : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt
index b70ccd44e02..b917eefb126 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NoFieldTypeRef : java.lang.Object {
+public open class NoFieldTypeRef {
     public constructor NoFieldTypeRef()
     public final var foo: kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.kt
index a4b2a4a3e4b..5f5042ef44e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class NotVarargReplacedWithVararg : Object() {
+public open class NotVarargReplacedWithVararg {
     public open fun foo(p0 : String?) {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index dd7d156b733..58c68108883 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotVarargReplacedWithVararg : java.lang.Object {
+public open class NotVarargReplacedWithVararg {
     public constructor NotVarargReplacedWithVararg()
     public open fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt
index 187eb4dabab..67b1827bba7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class RedundantProjectionKind : Object() {
+public open class RedundantProjectionKind {
     public open fun foo(list: List<Number>) {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
index 7c0f7a470e9..f40a661d262 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/RedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class RedundantProjectionKind : java.lang.Object {
+public open class RedundantProjectionKind {
     public constructor RedundantProjectionKind()
     public open fun foo(/*0*/ list: kotlin.List<kotlin.Number>): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.kt
index 493424dfd06..81a8ff06212 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class ReturnTypeMissing : Object() {
+public open class ReturnTypeMissing {
     public open fun foo(p0 : String?) : Int {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt
index 9d57aaf202f..97223540e62 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/ReturnTypeMissing.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class ReturnTypeMissing : java.lang.Object {
+public open class ReturnTypeMissing {
     public constructor ReturnTypeMissing()
     public open fun foo(/*0*/ p0: kotlin.String?): kotlin.Int
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.kt
index 4e253df9e78..eaadaef56e7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class SyntaxError : Object() {
+public open class SyntaxError {
     public open fun foo() : Int? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt
index b4538634edf..7f2ac874c73 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxError.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class SyntaxError : java.lang.Object {
+public open class SyntaxError {
     public constructor SyntaxError()
     public open fun foo(): kotlin.Int?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt
index 98695658c8e..500fd7d0036 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class SyntaxErrorInFieldAnnotation : Object() {
+public open class SyntaxErrorInFieldAnnotation {
     public var foo : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index c7d7df1339d..c0c29b3913e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class SyntaxErrorInFieldAnnotation : java.lang.Object {
+public open class SyntaxErrorInFieldAnnotation {
     public constructor SyntaxErrorInFieldAnnotation()
     public final var foo: kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.kt
index 9e1f210ecfa..2bb7e554f33 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class VarargReplacedWithNotVararg : Object() {
+public open class VarargReplacedWithNotVararg {
     public open fun foo(vararg p0 : String?) {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index 2dd6078c77b..2557fbd3454 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class VarargReplacedWithNotVararg : java.lang.Object {
+public open class VarargReplacedWithNotVararg {
     public constructor VarargReplacedWithNotVararg()
     public open fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.kt
index 79f06cf45b2..353edb22fe3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongFieldInitializer : Object() {
+public open class WrongFieldInitializer {
     public var foo : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt
index 1cb8d6974ad..aa6e3977dfb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongFieldInitializer : java.lang.Object {
+public open class WrongFieldInitializer {
     public constructor WrongFieldInitializer()
     public final var foo: kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.kt
index b77369b9593..7aeddecb5f8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.kt
@@ -3,7 +3,7 @@ package test
 
 import java.util.*
 
-public open class WrongFieldMutability : Object() {
+public open class WrongFieldMutability {
     public var fooNotFinal : String? = ""
     public val fooFinal : String? = "Test"
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt
index 77b81eaefeb..6308a3a4534 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongFieldMutability : java.lang.Object {
+public open class WrongFieldMutability {
     public constructor WrongFieldMutability()
     public final val fooFinal: kotlin.String? = "Test"
     public final var fooNotFinal: kotlin.String?
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.kt
index 932a1fdd1da..0f8968e4416 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongFieldName : Object() {
+public open class WrongFieldName {
     public var foo : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt
index a3bb940eb62..da8b62d7dc3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongFieldName.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongFieldName : java.lang.Object {
+public open class WrongFieldName {
     public constructor WrongFieldName()
     public final var foo: kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.kt
index f0eb308e794..2791fc6af4f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongMethodName : Object() {
+public open class WrongMethodName {
     public open fun foo() : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt
index ab9df9bfabd..8d45d70e303 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongMethodName.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongMethodName : java.lang.Object {
+public open class WrongMethodName {
     public constructor WrongMethodName()
     public open fun foo(): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.kt
index 8518497aa4a..0c48a6016cd 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class WrongProjectionKind : Object() {
+public open class WrongProjectionKind {
     public open fun copy(p0 : Array<out Number>?, p1 : Array<out Number>?) : MutableList<Number>? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt
index b2d801ac1a7..518ef98f8d3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongProjectionKind.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongProjectionKind : java.lang.Object {
+public open class WrongProjectionKind {
     public constructor WrongProjectionKind()
     public open fun copy(/*0*/ p0: kotlin.Array<out kotlin.Number>?, /*1*/ p1: kotlin.Array<out kotlin.Number>?): kotlin.MutableList<kotlin.Number>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.kt
index d3f47dca06b..3b9f211b3a0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongReturnTypeStructure : Object() {
+public open class WrongReturnTypeStructure {
     public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt
index 8798cb27fe7..6cb06c8fd10 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongReturnTypeStructure : java.lang.Object {
+public open class WrongReturnTypeStructure {
     public constructor WrongReturnTypeStructure()
     public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.kt
index 406116475a0..e1f0b44d658 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongTypeName1 : Object() {
+public open class WrongTypeName1 {
     public open fun foo(p0 : String?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt
index 75cc266d63c..0089616c8d7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName1.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeName1 : java.lang.Object {
+public open class WrongTypeName1 {
     public constructor WrongTypeName1()
     public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.kt
index 26145a2c22d..4f375258c8c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongTypeName2 : Object() {
+public open class WrongTypeName2 {
     public open fun foo(p0 : String?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt
index 644ff1c99eb..d084bb8cc74 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName2.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeName2 : java.lang.Object {
+public open class WrongTypeName2 {
     public constructor WrongTypeName2()
     public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.kt
index 47a0e4bd364..cffd9f2e130 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongTypeName3 : Object() {
+public open class WrongTypeName3 {
     public open fun foo(p0 : String?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt
index 4b99bf9b5a5..10725cca5c3 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeName3.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeName3 : java.lang.Object {
+public open class WrongTypeName3 {
     public constructor WrongTypeName3()
     public open fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
index 356d464de45..062813b972c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class WrongTypeParameterBoundStructure1 : Object() {
+public open class WrongTypeParameterBoundStructure1 {
     public open fun <A, B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable>? {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index ca8f645d57f..492924b65f4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeParameterBoundStructure1 : java.lang.Object {
+public open class WrongTypeParameterBoundStructure1 {
     public constructor WrongTypeParameterBoundStructure1()
     public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit where B : kotlin.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
index 90da78f0c95..fadf5c84b67 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class WrongTypeParameterBoundStructure2 : Object() {
+public open class WrongTypeParameterBoundStructure2 {
     public open fun <A, B : Runnable?> foo(p0 : A?, p1 : List<B>?) where B : List<Cloneable>? {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index bf750f3a722..5d2c7e53930 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeParameterBoundStructure2 : java.lang.Object {
+public open class WrongTypeParameterBoundStructure2 {
     public constructor WrongTypeParameterBoundStructure2()
     public open fun </*0*/ A, /*1*/ B : java.lang.Runnable?> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit where B : kotlin.List<java.lang.Cloneable>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.kt
index 06d7db9d906..33a061adcd5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class WrongTypeParametersCount : Object() {
+public open class WrongTypeParametersCount {
     public open fun <A, B> foo(p0 : A?, p1 : List<B>?) {
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
index 7bde9a3b756..43445a9c293 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongTypeParametersCount : java.lang.Object {
+public open class WrongTypeParametersCount {
     public constructor WrongTypeParametersCount()
     public open fun </*0*/ A, /*1*/ B> foo(/*0*/ p0: A?, /*1*/ p1: kotlin.List<B>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.kt
index 70469869cf8..88770966044 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongValueParameterStructure1 : Object() {
+public open class WrongValueParameterStructure1 {
     public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt
index b159f23788e..661517cca01 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongValueParameterStructure1 : java.lang.Object {
+public open class WrongValueParameterStructure1 {
     public constructor WrongValueParameterStructure1()
     public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.kt
index 5cf766dc255..6c2cdc27367 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class WrongValueParameterStructure2 : Object() {
+public open class WrongValueParameterStructure2 {
     public open fun foo(p0 : String?, p1 : List<Map.Entry<String, String>>?) : String? = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt
index f6c77322373..16c1f9a9dcb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongValueParameterStructure2 : java.lang.Object {
+public open class WrongValueParameterStructure2 {
     public constructor WrongValueParameterStructure2()
     public open fun foo(/*0*/ p0: kotlin.String?, /*1*/ p1: kotlin.List<kotlin.Map.Entry<kotlin.String, kotlin.String>>?): kotlin.String?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.kt
index 70b89330527..0c56cfa00e0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.kt
@@ -2,7 +2,7 @@ package test
 
 import java.util.*
 
-public open class WrongValueParametersCount : Object() {
+public open class WrongValueParametersCount {
     public open fun foo() : Int? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt
index b1a68d615ea..9bed085d6be 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/error/WrongValueParametersCount.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class WrongValueParametersCount : java.lang.Object {
+public open class WrongValueParametersCount {
     public constructor WrongValueParametersCount()
     public open fun foo(): kotlin.Int?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt
index 6ab722f6a44..71c791ad155 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait PropagateTypeArgumentNullable: Object {
+public trait PropagateTypeArgumentNullable {
 
-    public trait Super: Object {
+    public trait Super {
         public fun outS(p: List<String?>)
 
         public fun invOutS(p : MutableList<List<String?>>)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
index 46fd69d2a2b..38497dd0d31 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/PropagateTypeArgumentNullable.txt
@@ -1,7 +1,7 @@
 package test
 
-public trait PropagateTypeArgumentNullable : java.lang.Object {
-    
+public trait PropagateTypeArgumentNullable {
+
     public trait Sub : test.PropagateTypeArgumentNullable.Super {
         public abstract override /*1*/ fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
         public abstract override /*1*/ fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
@@ -10,8 +10,8 @@ public trait PropagateTypeArgumentNullable : java.lang.Object {
         public abstract override /*1*/ fun outR(): kotlin.List<kotlin.String?>
         public abstract override /*1*/ fun outS(/*0*/ p: kotlin.List<kotlin.String?>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun invOutR(): kotlin.MutableList<kotlin.List<kotlin.String?>>
         public abstract fun invOutS(/*0*/ p: kotlin.MutableList<kotlin.List<kotlin.String?>>): kotlin.Unit
         public abstract fun invR(): kotlin.MutableList<kotlin.String?>
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt
index c612b0f6323..0d1ef5be476 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait ChangeProjectionKind1: Object {
+public trait ChangeProjectionKind1 {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: MutableList<in String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
index cc2a1c9f673..496bc68f718 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind1.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait ChangeProjectionKind1 : java.lang.Object {
-    
+public trait ChangeProjectionKind1 {
+
     public trait Sub : test.ChangeProjectionKind1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt
index dc23f201720..405b1c1b0ae 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait ChangeProjectionKind2: Object {
+public trait ChangeProjectionKind2 {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: MutableList<String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
index 295e7824712..66edcbd7178 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ChangeProjectionKind2.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait ChangeProjectionKind2 : java.lang.Object {
-    
+public trait ChangeProjectionKind2 {
+
     public trait Sub : test.ChangeProjectionKind2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt
index b8a95e4f76b..94ca7fb568d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait DeeplySubstitutedClassParameter: Object {
+public trait DeeplySubstitutedClassParameter {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(t: T)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
index ce4fa2194fc..d85715b6570 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter : java.lang.Object {
-    
+public trait DeeplySubstitutedClassParameter {
+
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: E): kotlin.Unit
     }
-    
+
     public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt
index 8eaf0d060da..f69f9d9b7ff 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2: Object {
+public trait DeeplySubstitutedClassParameter2 {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(t: T)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
index 221e9e4d757..23450f1a63e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2 : java.lang.Object {
-    
+public trait DeeplySubstitutedClassParameter2 {
+
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ t: E): kotlin.Unit
     }
-    
+
     public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt
index 23498ea3af3..b0217380f47 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritMutability: Object {
+public trait InheritMutability {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: MutableList<String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
index 956a62c3858..b687ddd0921 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritMutability.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritMutability : java.lang.Object {
-    
+public trait InheritMutability {
+
     public trait Sub : test.InheritMutability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.kt
index 57a7f32659d..2c3c40ace47 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNotVararg: Object {
+public trait InheritNotVararg {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: Array<out String>?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index ba26295a7bc..7026686254d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVararg : java.lang.Object {
-    
+public trait InheritNotVararg {
+
     public trait Sub : test.InheritNotVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.String>?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt
index 2afdced1750..3d7d2cbb416 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNotVarargInteger: Object {
+public trait InheritNotVarargInteger {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: Array<out Int>?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 349ef8e9d95..1d4fd8a1f40 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargInteger : java.lang.Object {
-    
+public trait InheritNotVarargInteger {
+
     public trait Sub : test.InheritNotVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.Array<out kotlin.Int>?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt
index 10cf3c15366..078e223c328 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNotVarargNotNull: Object {
+public trait InheritNotVarargNotNull {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: Array<out String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
index fc01627957e..2a2f2c66d7a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargNotNull : java.lang.Object {
-    
+public trait InheritNotVarargNotNull {
+
     public trait Sub : test.InheritNotVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.Array<out kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt
index be571ba103e..57b55f25b9a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNotVarargPrimitive: Object {
+public trait InheritNotVarargPrimitive {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: IntArray?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index 7c87a6b5c0d..d8a94ad8413 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNotVarargPrimitive : java.lang.Object {
-    
+public trait InheritNotVarargPrimitive {
+
     public trait Sub : test.InheritNotVarargPrimitive.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.IntArray?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt
index 9dc9f0d3703..58f2b7dc065 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullability: Object {
+public trait InheritNullability {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: String)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
index d9685a8a476..adeae6a0fa2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritNullability.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullability : java.lang.Object {
-    
+public trait InheritNullability {
+
     public trait Sub : test.InheritNullability.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt
index d5f6000485b..667969b67ce 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritProjectionKind: Object {
+public trait InheritProjectionKind {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: MutableList<in String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
index 66b18af139e..bb45f37132a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritProjectionKind.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritProjectionKind : java.lang.Object {
-    
+public trait InheritProjectionKind {
+
     public trait Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.MutableList<in kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt
index c9628028223..7b01458aae0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritReadOnliness: Object {
+public trait InheritReadOnliness {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: List<String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
index 64e73080b7b..83491ecb0a0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritReadOnliness.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnliness : java.lang.Object {
-    
+public trait InheritReadOnliness {
+
     public trait Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.kt
index e0f17473c9a..ad89aecd444 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritVararg: Object {
+public trait InheritVararg {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(vararg p0: String?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
index 8f0507e473a..cd042b28f87 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVararg.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVararg : java.lang.Object {
-    
+public trait InheritVararg {
+
     public trait Sub : test.InheritVararg.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.kt
index f88eb2355c5..36eb9b3ed47 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritVarargInteger: Object {
+public trait InheritVarargInteger {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(vararg p0: Int?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
index 2f9e5d55899..edfdd9be785 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargInteger.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargInteger : java.lang.Object {
-    
+public trait InheritVarargInteger {
+
     public trait Sub : test.InheritVarargInteger.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.Int? /*kotlin.Array<kotlin.Int?>*/): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt
index cca9393c949..0fdd3bfaa59 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritVarargNotNull: Object {
+public trait InheritVarargNotNull {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(vararg p: String)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
index b24ec6ab7d3..3aaae6178ac 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargNotNull.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargNotNull : java.lang.Object {
-    
+public trait InheritVarargNotNull {
+
     public trait Sub : test.InheritVarargNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt
index aeb020e0ef5..b2f627c8586 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritVarargPrimitive: Object {
+public trait InheritVarargPrimitive {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(vararg p0: Int)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
index 33169113082..fb59836fb67 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/InheritVarargPrimitive.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritVarargPrimitive : java.lang.Object {
-    
+public trait InheritVarargPrimitive {
+
     public trait Sub : test.InheritVarargPrimitive.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt
index 8084f3aae11..0d2f87aa30d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.kt
@@ -1,14 +1,14 @@
 package test
 
 // See SubclassFromGenericAndNot, as well
-public trait Kt3302: Object {
-    public trait BSONObject : Object {
+public trait Kt3302 {
+    public trait BSONObject  {
         public fun put(p0: String, p1: Any): Any?
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait LinkedHashMap<K, V> : Object {
+    public trait LinkedHashMap<K, V>  {
         public fun put(key: K, value: V): V?
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt
index bfaedf58b6c..80d02cceaf8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait Kt3302 : java.lang.Object {
-    
-    public trait BSONObject : java.lang.Object {
+public trait Kt3302 {
+
+    public trait BSONObject {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun put(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.Any): kotlin.Any?
     }
-    
+
     public trait BasicBSONObject : test.Kt3302.LinkedHashMap<kotlin.String, kotlin.Any>, test.Kt3302.BSONObject {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun put(/*0*/ key: kotlin.String, /*1*/ value: kotlin.Any): kotlin.Any?
     }
-    
-    public trait LinkedHashMap</*0*/ K, /*1*/ V> : java.lang.Object {
+
+    public trait LinkedHashMap</*0*/ K, /*1*/ V> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt
index 7c2f31cc7fa..ac5d13e7a1c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait MutableToReadOnly: Object {
+public trait MutableToReadOnly {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: MutableList<String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
index 86a64ddfbfb..20d378dd58c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/MutableToReadOnly.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait MutableToReadOnly : java.lang.Object {
-    
+public trait MutableToReadOnly {
+
     public trait Sub : test.MutableToReadOnly.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.MutableList<kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt
index 9fb15ced7bb..0c7f45ed64d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait NotNullToNullable: Object {
+public trait NotNullToNullable {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: String)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
index 8fff3016832..c91fe7f5f3c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NotNullToNullable.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait NotNullToNullable : java.lang.Object {
-    
+public trait NotNullToNullable {
+
     public trait Sub : test.NotNullToNullable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt
index 65dbc0234b8..924682611f0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait NullableToNotNull: Object {
+public trait NullableToNotNull {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p0: String?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index 49a639cb1bd..ade5f610b00 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait NullableToNotNull : java.lang.Object {
-    
+public trait NullableToNotNull {
+
     public trait Sub : test.NullableToNotNull.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt
index f4a88716f6c..cf11f06dedf 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait NullableToNotNullKotlinSignature: Object {
+public trait NullableToNotNullKotlinSignature {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: String?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index 5cd041dfdfc..7a1e5819cfa 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait NullableToNotNullKotlinSignature : java.lang.Object {
-    
+public trait NullableToNotNullKotlinSignature {
+
     public trait Sub : test.NullableToNotNullKotlinSignature.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.String?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt
index 20a80fac851..3e74342628f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait OverrideWithErasedParameter: Object {
+public trait OverrideWithErasedParameter {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(p0: T?)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
index 5c8600f2917..508434d2ca0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait OverrideWithErasedParameter : java.lang.Object {
-    
+public trait OverrideWithErasedParameter {
+
     public trait Sub</*0*/ T> : test.OverrideWithErasedParameter.Super<T> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p0: T?): kotlin.Unit
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt
index 9aedf9585bf..1f6e29bc233 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait ReadOnlyToMutable: Object {
+public trait ReadOnlyToMutable {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(p: List<String>)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
index c49f11170de..b6fc1f31da6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/ReadOnlyToMutable.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait ReadOnlyToMutable : java.lang.Object {
-    
+public trait ReadOnlyToMutable {
+
     public trait Sub : test.ReadOnlyToMutable.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p: kotlin.List<kotlin.String>): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt
index 11358dc08a3..ff273173e02 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt
@@ -1,15 +1,15 @@
 package test
 
 // Extracted from KT-3302, see Kt3302 test, as well
-public trait SubclassFromGenericAndNot: Object {
+public trait SubclassFromGenericAndNot {
 
-    public trait NonGeneric : Object {
+    public trait NonGeneric  {
         public fun foo(p0: String)
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Generic<T> : Object {
+    public trait Generic<T>  {
         public fun foo(key: T)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
index 5defb1a4d55..bb185d71dce 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.txt
@@ -1,17 +1,17 @@
 package test
 
-public trait SubclassFromGenericAndNot : java.lang.Object {
-    
-    public trait Generic</*0*/ T> : java.lang.Object {
+public trait SubclassFromGenericAndNot {
+
+    public trait Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ key: T): kotlin.Unit
     }
-    
-    public trait NonGeneric : java.lang.Object {
+
+    public trait NonGeneric {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ p0: kotlin.String): kotlin.Unit
     }
-    
+
     public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(/*0*/ key: kotlin.String): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt
index a6e7dc13141..cd9732d60e0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait SubstitutedClassParameter: Object {
+public trait SubstitutedClassParameter {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(t: T)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
index 59e19442acc..29b462d8d7f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameter.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait SubstitutedClassParameter : java.lang.Object {
-    
+public trait SubstitutedClassParameter {
+
     public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt
index cd7dbb30a6f..6a1d0abe309 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait SubstitutedClassParameters: Object {
+public trait SubstitutedClassParameters {
 
-    public trait Super1<T>: Object {
+    public trait Super1<T> {
         public fun foo(t: T)
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2<E>: Object {
+    public trait Super2<E> {
         public fun foo(t: E)
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
index ce0cb867d4e..24d12a57ebb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/parameter/SubstitutedClassParameters.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait SubstitutedClassParameters : java.lang.Object {
-    
+public trait SubstitutedClassParameters {
+
     public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
     }
-    
-    public trait Super1</*0*/ T> : java.lang.Object {
+
+    public trait Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: T): kotlin.Unit
     }
-    
-    public trait Super2</*0*/ E> : java.lang.Object {
+
+    public trait Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(/*0*/ t: E): kotlin.Unit
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt
index 6c15919808f..3788f264811 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNotNullJavaSubtype : Object {
+public trait AddNotNullJavaSubtype  {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence?
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index 1f01b752f2b..b47be08e907 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNotNullJavaSubtype : java.lang.Object {
-    
+public trait AddNotNullJavaSubtype {
+
     public trait Sub : test.AddNotNullJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt
index bb4ffeac695..216c9d16883 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNotNullSameJavaType: Object {
+public trait AddNotNullSameJavaType {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence?
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index 34bd6fef622..9c8ac430929 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNotNullSameJavaType : java.lang.Object {
-    
+public trait AddNotNullSameJavaType {
+
     public trait Sub : test.AddNotNullSameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.CharSequence
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt
index 18223d10a85..ad181b72234 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNullabilityJavaSubtype: Object {
+public trait AddNullabilityJavaSubtype {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
index de12604c349..04aa3be6110 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilityJavaSubtype : java.lang.Object {
-    
+public trait AddNullabilityJavaSubtype {
+
     public trait Sub : test.AddNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt
index 9519d182e21..31d3673d134 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNullabilitySameGenericType1: Object {
+public trait AddNullabilitySameGenericType1 {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableList<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
index bf1f9c087de..9d67a3e2eb2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameGenericType1 : java.lang.Object {
-    
+public trait AddNullabilitySameGenericType1 {
+
     public trait Sub : test.AddNullabilitySameGenericType1.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt
index 9dc8cd26ef6..eafbf6d76e6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNullabilitySameGenericType2: Object {
+public trait AddNullabilitySameGenericType2 {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableList<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
index 7d44d6fe9f5..741a239056d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameGenericType2 : java.lang.Object {
-    
+public trait AddNullabilitySameGenericType2 {
+
     public trait Sub : test.AddNullabilitySameGenericType2.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt
index f4b350ef7a6..34716b6de79 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait AddNullabilitySameJavaType: Object {
+public trait AddNullabilitySameJavaType {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
index 810c81a5682..7a8e6eb18f4 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/AddNullabilitySameJavaType.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AddNullabilitySameJavaType : java.lang.Object {
-    
+public trait AddNullabilitySameJavaType {
+
     public trait Sub : test.AddNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.CharSequence
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt
index 3e13c2e8d2f..3c4b1e6e788 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait CantMakeImmutableInSubclass: Object {
+public trait CantMakeImmutableInSubclass {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableCollection<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
index e4783606e09..d9ca0b67761 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait CantMakeImmutableInSubclass : java.lang.Object {
-    
+public trait CantMakeImmutableInSubclass {
+
     public trait Sub : test.CantMakeImmutableInSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt
index ffa399eb9ba..38985e9013c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait DeeplySubstitutedClassParameter: Object {
+public trait DeeplySubstitutedClassParameter {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
index 85da545e446..d2bd5d3c192 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter : java.lang.Object {
-    
+public trait DeeplySubstitutedClassParameter {
+
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter.Super<E> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): E
     }
-    
+
     public trait Sub : test.DeeplySubstitutedClassParameter.Middle<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt
index 0ecadadb87f..a1ec7f4b73f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2: Object {
+public trait DeeplySubstitutedClassParameter2 {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
index ef9b2d460d6..aa135b90e49 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait DeeplySubstitutedClassParameter2 : java.lang.Object {
-    
+public trait DeeplySubstitutedClassParameter2 {
+
     public trait Middle</*0*/ E> : test.DeeplySubstitutedClassParameter2.Super<E> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ /*fake_override*/ fun foo(): E
     }
-    
+
     public trait Sub : test.DeeplySubstitutedClassParameter2.Middle<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
index ab6aea374e0..4e9c0968e64 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt
@@ -1,10 +1,10 @@
 package test
 
-public trait HalfSubstitutedTypeParameters: Object {
+public trait HalfSubstitutedTypeParameters {
 
     public trait TrickyList<X, E>: MutableList<E> {}
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableList<String?>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index c3dd3d3121c..c9a06f17937 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -1,17 +1,17 @@
 package test
 
-public trait HalfSubstitutedTypeParameters : java.lang.Object {
-    
+public trait HalfSubstitutedTypeParameters {
+
     public trait Sub : test.HalfSubstitutedTypeParameters.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): test.HalfSubstitutedTypeParameters.TrickyList<kotlin.Int, kotlin.String?>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.String?>
     }
-    
+
     public trait TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt
index 8b8d61c8baa..a0ef6f5b9be 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullabilityGenericSubclassSimple: Object {
+public trait InheritNullabilityGenericSubclassSimple {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableCollection<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
index d61130d1443..ed2154c4687 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilityGenericSubclassSimple : java.lang.Object {
-    
+public trait InheritNullabilityGenericSubclassSimple {
+
     public trait Sub : test.InheritNullabilityGenericSubclassSimple.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt
index a0fc1fca24c..502952f0788 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullabilityJavaSubtype: Object {
+public trait InheritNullabilityJavaSubtype {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
index 18ca93ce358..371d96b0fdb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilityJavaSubtype : java.lang.Object {
-    
+public trait InheritNullabilityJavaSubtype {
+
     public trait Sub : test.InheritNullabilityJavaSubtype.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt
index 75f95088e64..172b9e626df 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullabilitySameGenericType: Object {
+public trait InheritNullabilitySameGenericType {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableList<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
index 3d6312fe166..046900e4340 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilitySameGenericType : java.lang.Object {
-    
+public trait InheritNullabilitySameGenericType {
+
     public trait Sub : test.InheritNullabilitySameGenericType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt
index 6397518a1e9..de5f4f4a73d 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullabilitySameJavaType: Object {
+public trait InheritNullabilitySameJavaType {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
index d0c869928ff..dc7f971d02c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritNullabilitySameJavaType : java.lang.Object {
-    
+public trait InheritNullabilitySameJavaType {
+
     public trait Sub : test.InheritNullabilitySameJavaType.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.CharSequence
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.kt
index 75977f678f1..4c6278fd0ad 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritProjectionKind: Object {
+public trait InheritProjectionKind {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableCollection<out Number>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt
index 53342c72f76..d5a6705f372 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritProjectionKind.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritProjectionKind : java.lang.Object {
-    
+public trait InheritProjectionKind {
+
     public trait Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableList<out kotlin.Number>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt
index 7581525440d..22c40fff363 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritReadOnlinessOfArgument: Object {
+public trait InheritReadOnlinessOfArgument {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): List<List<String>>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
index 71276c246f2..43b547c2d5c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessOfArgument : java.lang.Object {
-    
+public trait InheritReadOnlinessOfArgument {
+
     public trait Sub : test.InheritReadOnlinessOfArgument.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.List<kotlin.List<kotlin.String>>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt
index 8a9c85232df..a2aa64cb5ea 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritReadOnlinessSameClass: Object {
+public trait InheritReadOnlinessSameClass {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): List<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
index 4307f37db27..be5a6e6b3f1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessSameClass : java.lang.Object {
-    
+public trait InheritReadOnlinessSameClass {
+
     public trait Sub : test.InheritReadOnlinessSameClass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt
index 6e352a64049..ff1baea0afa 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritReadOnlinessSubclass: Object {
+public trait InheritReadOnlinessSubclass {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): Collection<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
index dfe072f6805..0976e7ae10b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait InheritReadOnlinessSubclass : java.lang.Object {
-    
+public trait InheritReadOnlinessSubclass {
+
     public trait Sub : test.InheritReadOnlinessSubclass.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.List<kotlin.String>
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.Collection<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.kt
index 877ed3d6e44..193cd1e9bee 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait SameProjectionKind: Object {
+public trait SameProjectionKind {
 
-    public trait Super: Object {
+    public trait Super {
         public fun foo(): MutableCollection<out Number?>?
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt
index fc08382acff..01b9da26748 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait SameProjectionKind : java.lang.Object {
-    
+public trait SameProjectionKind {
+
     public trait Sub : test.SameProjectionKind.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<out kotlin.Number?>?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt
index a4ec7edb0f8..afa037d4568 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait SubclassFromGenericAndNot: Object {
+public trait SubclassFromGenericAndNot {
 
-    public trait NonGeneric : Object {
+    public trait NonGeneric  {
         public fun foo(): String?
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Generic<T> : Object {
+    public trait Generic<T>  {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
index e4ba02eaa82..1f4549c24df 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
@@ -1,17 +1,17 @@
 package test
 
-public trait SubclassFromGenericAndNot : java.lang.Object {
-    
-    public trait Generic</*0*/ T> : java.lang.Object {
+public trait SubclassFromGenericAndNot {
+
+    public trait Generic</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
-    
-    public trait NonGeneric : java.lang.Object {
+
+    public trait NonGeneric {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.String?
     }
-    
+
     public trait Sub : test.SubclassFromGenericAndNot.NonGeneric, test.SubclassFromGenericAndNot.Generic<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt
index 7a3a30324f3..02adf379735 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait SubstitutedClassParameter: Object {
+public trait SubstitutedClassParameter {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
index 952b276dcfe..d6e78ee9766 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameter.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait SubstitutedClassParameter : java.lang.Object {
-    
+public trait SubstitutedClassParameter {
+
     public trait Sub : test.SubstitutedClassParameter.Super<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt
index 4f24276cc40..3cb8c75ab78 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait SubstitutedClassParameters: Object {
+public trait SubstitutedClassParameters {
 
-    public trait Super1<T>: Object {
+    public trait Super1<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2<E>: Object {
+    public trait Super2<E> {
         public fun foo(): E
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
index 446f124757c..177bba1d7fb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/SubstitutedClassParameters.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait SubstitutedClassParameters : java.lang.Object {
-    
+public trait SubstitutedClassParameters {
+
     public trait Sub : test.SubstitutedClassParameters.Super1<kotlin.String>, test.SubstitutedClassParameters.Super2<kotlin.String> {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String
     }
-    
-    public trait Super1</*0*/ T> : java.lang.Object {
+
+    public trait Super1</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
-    
-    public trait Super2</*0*/ E> : java.lang.Object {
+
+    public trait Super2</*0*/ E> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): E
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt
index 84f132dfe7f..48769f2a937 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesConflictingProjectionKinds: Object {
+public trait TwoSuperclassesConflictingProjectionKinds {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): MutableCollection<CharSequence>
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): MutableCollection<out CharSequence>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
index f01fe9bb6f7..979da14b148 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesConflictingProjectionKinds : java.lang.Object {
-    
+public trait TwoSuperclassesConflictingProjectionKinds {
+
     public trait Sub : test.TwoSuperclassesConflictingProjectionKinds.Super1, test.TwoSuperclassesConflictingProjectionKinds.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<kotlin.CharSequence>
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<out kotlin.CharSequence>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt
index 7809805a564..fc100276007 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferMutability: Object {
+public trait TwoSuperclassesInvariantAndCovariantInferMutability {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): List<List<String>>
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): MutableList<MutableList<String>>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
index 0f23605bf04..b4103e662cf 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferMutability : java.lang.Object {
-    
+public trait TwoSuperclassesInvariantAndCovariantInferMutability {
+
     public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferMutability.Super1, test.TwoSuperclassesInvariantAndCovariantInferMutability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.List<kotlin.String>>
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.MutableList<kotlin.String>>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt
index 42312d42be1..619d3384d30 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferNullability: Object {
+public trait TwoSuperclassesInvariantAndCovariantInferNullability {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): List<String?>
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): MutableList<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
index b6c4c1f2cad..899b3f05d6f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesInvariantAndCovariantInferNullability : java.lang.Object {
-    
+public trait TwoSuperclassesInvariantAndCovariantInferNullability {
+
     public trait Sub : test.TwoSuperclassesInvariantAndCovariantInferNullability.Super1, test.TwoSuperclassesInvariantAndCovariantInferNullability.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.String?>
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableList<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt
index aaf505259ae..6f735c2b6a5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesMutableAndNot: Object {
+public trait TwoSuperclassesMutableAndNot {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): MutableCollection<String>
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): List<String>
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
index 1eb02c8dc14..f8766e5099b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesMutableAndNot : java.lang.Object {
-    
+public trait TwoSuperclassesMutableAndNot {
+
     public trait Sub : test.TwoSuperclassesMutableAndNot.Super1, test.TwoSuperclassesMutableAndNot.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.MutableCollection<kotlin.String>
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.String>
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt
index d9ee0bdeda0..d6ec4d471e1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesReturnJavaSubtype: Object {
+public trait TwoSuperclassesReturnJavaSubtype {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): CharSequence?
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index 1fb3f31d222..e5118ab022c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesReturnJavaSubtype : java.lang.Object {
-    
+public trait TwoSuperclassesReturnJavaSubtype {
+
     public trait Sub : test.TwoSuperclassesReturnJavaSubtype.Super1, test.TwoSuperclassesReturnJavaSubtype.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.String
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence?
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt
index 077208f048d..49a9a598501 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesReturnSameJavaType: Object {
+public trait TwoSuperclassesReturnSameJavaType {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): CharSequence?
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): CharSequence
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index b2eaccccda0..984264eb3ab 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesReturnSameJavaType : java.lang.Object {
-    
+public trait TwoSuperclassesReturnSameJavaType {
+
     public trait Sub : test.TwoSuperclassesReturnSameJavaType.Super1, test.TwoSuperclassesReturnSameJavaType.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.CharSequence
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence?
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.CharSequence
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt
index a1c3e741efa..50f4406acb2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt
@@ -1,14 +1,14 @@
 package test
 
-public trait TwoSuperclassesSupplementNotNull: Object {
+public trait TwoSuperclassesSupplementNotNull {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun foo(): List<String?>
 
         public fun dummy() // to avoid loading as SAM interface
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun foo(): List<String>?
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 9c829a8e9b8..4db979aea9a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -1,18 +1,18 @@
 package test
 
-public trait TwoSuperclassesSupplementNotNull : java.lang.Object {
-    
+public trait TwoSuperclassesSupplementNotNull {
+
     public trait Sub : test.TwoSuperclassesSupplementNotNull.Super1, test.TwoSuperclassesSupplementNotNull.Super2 {
         public abstract override /*2*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*2*/ fun foo(): kotlin.List<kotlin.String>
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.String?>
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): kotlin.List<kotlin.String>?
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.kt
index ab0371fe8d1..081631672a7 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait TypeParamOfClass: Object {
+public trait TypeParamOfClass {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt
index 3e0ec23b8e5..a8e6056ab2e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClass.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfClass : java.lang.Object {
-    
+public trait TypeParamOfClass {
+
     public trait Sub</*0*/ T> : test.TypeParamOfClass.Super<T> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): T
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt
index bc88a9c200e..813a4d3196a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait TypeParamOfClassSubstituted: Object {
+public trait TypeParamOfClassSubstituted {
 
-    public trait Super<T>: Object {
+    public trait Super<T> {
         public fun foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
index 4366e87a237..b24b4900e03 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfClassSubstituted : java.lang.Object {
-    
+public trait TypeParamOfClassSubstituted {
+
     public trait Sub : test.TypeParamOfClassSubstituted.Super<kotlin.String> {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun foo(): kotlin.String
     }
-    
-    public trait Super</*0*/ T> : java.lang.Object {
+
+    public trait Super</*0*/ T> {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.kt
index bc8e9ce7321..90bc7764f29 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait TypeParamOfFun: Object {
+public trait TypeParamOfFun {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <T> foo(): T
 
         public fun dummy() // to avoid loading as SAM interface
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt
index d6f55664a65..93f004c529b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/return/TypeParamOfFun.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait TypeParamOfFun : java.lang.Object {
-    
+public trait TypeParamOfFun {
+
     public trait Sub : test.TypeParamOfFun.Super {
         public abstract override /*1*/ /*fake_override*/ fun dummy(): kotlin.Unit
         public abstract override /*1*/ fun </*0*/ E> foo(): E
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun dummy(): kotlin.Unit
         public abstract fun </*0*/ T> foo(): T
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt
index 01fb9db29bf..453fd1756f2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritMutability: Object {
+public trait InheritMutability {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A: MutableList<String>> foo(a: A)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
index 61ec8789931..3df3d6148ef 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritMutability.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait InheritMutability : java.lang.Object {
-    
+public trait InheritMutability {
+
     public trait Sub : test.InheritMutability.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A : kotlin.MutableList<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt
index 751339f9afd..5753c4d2fac 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritNullability: Object {
+public trait InheritNullability {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A: CharSequence> foo(a: A)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
index 2261639d6a9..ee84451ab09 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritNullability.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait InheritNullability : java.lang.Object {
-    
+public trait InheritNullability {
+
     public trait Sub : test.InheritNullability.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt
index e4bed7b2370..81a1e0f0b07 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritReadOnliness: Object {
+public trait InheritReadOnliness {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A: List<String>> foo(a: A)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
index aba77321290..31fb9c78899 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/InheritReadOnliness.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait InheritReadOnliness : java.lang.Object {
-    
+public trait InheritReadOnliness {
+
     public trait Sub : test.InheritReadOnliness.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.List<kotlin.String>> foo(/*0*/ a: B): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A : kotlin.List<kotlin.String>> foo(/*0*/ a: A): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt
index 37f54d4b9d2..dacf5136a8c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait TwoBounds: Object {
+public trait TwoBounds {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A: CharSequence> foo(a: A) where A: Cloneable
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
index 25ea7d8c0d9..912ed04a8bb 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoBounds.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait TwoBounds : java.lang.Object {
-    
+public trait TwoBounds {
+
     public trait Sub : test.TwoBounds.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit where B : java.lang.Cloneable
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit where A : java.lang.Cloneable
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt
index e5b7a3f6db2..83a477b579e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt
@@ -1,12 +1,12 @@
 package test
 
-public trait TwoSuperclasses: Object {
+public trait TwoSuperclasses {
 
-    public trait Super1: Object {
+    public trait Super1 {
         public fun <A: CharSequence> foo(a: A)
     }
 
-    public trait Super2: Object {
+    public trait Super2 {
         public fun <B: CharSequence> foo(a: B)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
index 09cb4a48108..efba57c8f95 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoSuperclasses.txt
@@ -1,16 +1,16 @@
 package test
 
-public trait TwoSuperclasses : java.lang.Object {
-    
+public trait TwoSuperclasses {
+
     public trait Sub : test.TwoSuperclasses.Super1, test.TwoSuperclasses.Super2 {
         public abstract override /*2*/ fun </*0*/ C : kotlin.CharSequence> foo(/*0*/ a: C): kotlin.Unit
     }
-    
-    public trait Super1 : java.lang.Object {
+
+    public trait Super1 {
         public abstract fun </*0*/ A : kotlin.CharSequence> foo(/*0*/ a: A): kotlin.Unit
     }
-    
-    public trait Super2 : java.lang.Object {
+
+    public trait Super2 {
         public abstract fun </*0*/ B : kotlin.CharSequence> foo(/*0*/ a: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt
index cb5b249664b..84777759049 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait TwoTypeParameters: Object {
+public trait TwoTypeParameters {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A: CharSequence, B: Cloneable> foo(a: A, b: B)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
index 339c7c6feee..4e824b9b925 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/TwoTypeParameters.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait TwoTypeParameters : java.lang.Object {
-    
+public trait TwoTypeParameters {
+
     public trait Sub : test.TwoTypeParameters.Super {
         public abstract override /*1*/ fun </*0*/ B : kotlin.CharSequence, /*1*/ A : java.lang.Cloneable> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A : kotlin.CharSequence, /*1*/ B : java.lang.Cloneable> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt
index 04ef1a2a495..8f2a4121b68 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait UseParameterAsUpperBound: Object {
+public trait UseParameterAsUpperBound {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A, B: A> foo(a: A, b: B)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
index 12a887fa175..3c1a244c604 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterAsUpperBound : java.lang.Object {
-    
+public trait UseParameterAsUpperBound {
+
     public trait Sub : test.UseParameterAsUpperBound.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : B> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A, /*1*/ B : A> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt
index d2ccdddb76c..b3782f7cd65 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait UseParameterInUpperBound: Object {
+public trait UseParameterInUpperBound {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A, B: List<A>> foo(a: A, b: B)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
index 6efdd6b972d..e84b3ad4977 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterInUpperBound : java.lang.Object {
-    
+public trait UseParameterInUpperBound {
+
     public trait Sub : test.UseParameterInUpperBound.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ a: B, /*1*/ b: A): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt
index 1a40d3c1814..78bec2f2bb0 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt
@@ -1,8 +1,8 @@
 package test
 
-public trait UseParameterInUpperBoundWithKotlinSignature: Object {
+public trait UseParameterInUpperBoundWithKotlinSignature {
 
-    public trait Super: Object {
+    public trait Super {
         public fun <A, B: List<A>> foo(a: A, b: B)
     }
 
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
index a37ba85ebc6..f1b548ae9a2 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.txt
@@ -1,12 +1,12 @@
 package test
 
-public trait UseParameterInUpperBoundWithKotlinSignature : java.lang.Object {
-    
+public trait UseParameterInUpperBoundWithKotlinSignature {
+
     public trait Sub : test.UseParameterInUpperBoundWithKotlinSignature.Super {
         public abstract override /*1*/ fun </*0*/ B, /*1*/ A : kotlin.List<B>> foo(/*0*/ b: B, /*1*/ a: A): kotlin.Unit
     }
-    
-    public trait Super : java.lang.Object {
+
+    public trait Super {
         public abstract fun </*0*/ A, /*1*/ B : kotlin.List<A>> foo(/*0*/ a: A, /*1*/ b: B): kotlin.Unit
     }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.kt
index 22e4b3ea2f8..1c511ceba6a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.kt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterable<T> : java.lang.Object {
+public trait LoadIterable<T> {
     public fun getIterable(): MutableIterable<T>?
     public fun setIterable(p0: Iterable<T>?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
index 6482f29ef79..8bbe029a6b8 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterable</*0*/ T> : java.lang.Object {
+public trait LoadIterable</*0*/ T> {
     public abstract fun getIterable(): kotlin.MutableIterable<T>?
     public abstract fun setIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.kt
index d43c39e15b9..6961dcf5c7a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.kt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterator<T> : java.lang.Object {
+public trait LoadIterator<T> {
     public fun getIterator(): MutableIterator<T>?
     public fun setIterator(p0: Iterator<T>?)
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
index 1e867a8e3fc..46ebe4d178f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterator</*0*/ T> : java.lang.Object {
+public trait LoadIterator</*0*/ T> {
     public abstract fun getIterator(): kotlin.MutableIterator<T>?
     public abstract fun setIterator(/*0*/ p0: kotlin.Iterator<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.kt
index c8aa91532be..4c4fce88b50 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.kt
@@ -1,6 +1,6 @@
 package test
 
-public open class Max: Object() {
+public open class Max {
     public open fun max<T : Any?>(p0 : Collection<T>?): T?  where T : Comparable<T>? {
         throw UnsupportedOperationException()
     }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt
index 13ed15d6430..d062eae5f00 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/library/Max.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class Max : java.lang.Object {
+public open class Max {
     public constructor Max()
     public open fun </*0*/ T> max(/*0*/ p0: kotlin.Collection<T>?): T? where T : kotlin.Comparable<T>?
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.kt
index d91b74d30d3..d37c9e22694 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.kt
@@ -2,7 +2,7 @@ package test
 
 import org.jetbrains.annotations.*
 
-public trait LoadIterable<T> : java.lang.Object {
+public trait LoadIterable<T> {
     Mutable
     public fun getIterable(): MutableIterable<T>?
     public fun setIterable([Mutable] p0: MutableIterable<T>?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt
index 97656f57415..419ce0e8b5a 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterable.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterable</*0*/ T> : java.lang.Object {
+public trait LoadIterable</*0*/ T> {
     org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
     org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.kt
index a29754daca8..1ca3be99181 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.kt
@@ -2,7 +2,7 @@ package test
 
 import org.jetbrains.annotations.*
 
-public trait LoadIterableWithConflict<T> : java.lang.Object {
+public trait LoadIterableWithConflict<T> {
     [ReadOnly] [Mutable]
     public fun getIterable(): MutableIterable<T>?
     public fun setIterable([ReadOnly] [Mutable] p0: MutableIterable<T>?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt
index 52e5b2fc675..24508b62f79 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithConflict.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterableWithConflict</*0*/ T> : java.lang.Object {
+public trait LoadIterableWithConflict</*0*/ T> {
     org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.kt
index a953b293032..a12cab694f6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.kt
@@ -2,7 +2,7 @@ package test
 
 import org.jetbrains.annotations.*
 
-public trait LoadIterableWithNullability<T> : java.lang.Object {
+public trait LoadIterableWithNullability<T> {
     Mutable
     public fun getIterable(): MutableIterable<T>
     public fun setIterable([Mutable] p0: MutableIterable<T>)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt
index 5a773c964d2..883eae2e90c 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithNullability.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait LoadIterableWithNullability</*0*/ T> : java.lang.Object {
+public trait LoadIterableWithNullability</*0*/ T> {
     org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>
     org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>
     public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>): kotlin.Unit
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.kt
index b9d4da2ba73..12bc5b12de1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.kt
@@ -3,8 +3,8 @@ package test
 import java.util.ArrayList
 import org.jetbrains.annotations.*
 
-public trait LoadIterableWithPropagation: java.lang.Object {
-    public trait LoadIterable<T> : java.lang.Object {
+public trait LoadIterableWithPropagation {
+    public trait LoadIterable<T> {
         Mutable
         public fun getIterable(): MutableIterable<T>?
         public fun setIterable([Mutable] p0: MutableIterable<T>?)
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt
index d6e344792b4..57a2ac387e5 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/mutability/LoadIterableWithPropagation.txt
@@ -1,14 +1,14 @@
 package test
 
-public trait LoadIterableWithPropagation : java.lang.Object {
-    
-    public trait LoadIterable</*0*/ T> : java.lang.Object {
+public trait LoadIterableWithPropagation {
+
+    public trait LoadIterable</*0*/ T> {
         org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
         org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
         public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
         public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>?): kotlin.Unit
     }
-    
+
     public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T> {
         public constructor LoadIterableImpl</*0*/ T>()
         public open override /*1*/ fun getIterable(): kotlin.MutableIterable<T>?
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.kt
index 0b0a904c87a..024af0bfa0e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.kt
@@ -1,5 +1,5 @@
 package test;
 
-public open class NotNullField() : java.lang.Object() {
+public open class NotNullField() {
     public var hi: String = "";
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt
index cdc5dbfc549..f3c3808526b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullField.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotNullField : java.lang.Object {
+public open class NotNullField {
     public constructor NotNullField()
     public final var hi: kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.kt
index 396a2f5a410..50270eb80ec 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class NotNullIntArray() : java.lang.Object() {
+public open class NotNullIntArray() {
     public open fun hi(): IntArray = throw Exception()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt
index 4930124c06a..78ebd40404b 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullIntArray.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotNullIntArray : java.lang.Object {
+public open class NotNullIntArray {
     public constructor NotNullIntArray()
     public open fun hi(): kotlin.IntArray
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.kt
index 525aaa4cbfb..2ccdc41d3ec 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class NotNullMethod() : java.lang.Object() {
+public open class NotNullMethod() {
     public open fun hi(): String = ""
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt
index f42717697f0..d687ebcf605 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullMethod.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotNullMethod : java.lang.Object {
+public open class NotNullMethod {
     public constructor NotNullMethod()
     public open fun hi(): kotlin.String
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.kt
index 85ffaefdcc8..0e95601f39f 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class NotNullObjectArray() : java.lang.Object() {
+public open class NotNullObjectArray() {
     public open fun hi(): Array<Any> = throw Exception()
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt
index 33d97acf9d5..8c203394955 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullObjectArray.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotNullObjectArray : java.lang.Object {
+public open class NotNullObjectArray {
     public constructor NotNullObjectArray()
     public open fun hi(): kotlin.Array<kotlin.Any>
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.kt
index b20f8613349..0265d332b40 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class NotNullParameter() : java.lang.Object() {
+public open class NotNullParameter() {
     public open fun hi(p0: String): Unit { }
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
index d11d4fe0157..1b0434830d6 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/notNull/NotNullParameter.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class NotNullParameter : java.lang.Object {
+public open class NotNullParameter {
     public constructor NotNullParameter()
     public open fun hi(/*0*/ p0: kotlin.String): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.kt
index f7477dfee1f..02f53dae98e 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class VarargInt() : java.lang.Object() {
+public open class VarargInt() {
     public open fun vararg(vararg p0: Int): Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
index 611ba5e4f33..fa1445cf4b1 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargInt.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class VarargInt : java.lang.Object {
+public open class VarargInt {
     public constructor VarargInt()
     public open fun vararg(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.kt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.kt
index 267e6a316aa..ebaac7b6e23 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.kt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.kt
@@ -1,5 +1,5 @@
 package test
 
-public open class VarargString() : java.lang.Object() {
+public open class VarargString() {
     public open fun vararg(vararg p0: String?): Unit = Unit
 }
diff --git a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
index a529b8e99f0..6294b87ed40 100644
--- a/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
+++ b/compiler/testData/loadJava/compiledJavaCompareWithKotlin/vararg/VarargString.txt
@@ -1,6 +1,6 @@
 package test
 
-public open class VarargString : java.lang.Object {
+public open class VarargString {
     public constructor VarargString()
     public open fun vararg(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
 }