diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassDescriptor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassDescriptor.java
index 91508d3bda4..238c26d2f28 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassDescriptor.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassDescriptor.java
@@ -22,7 +22,6 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
     private final Set<ConstructorDescriptor> constructors = Sets.newLinkedHashSet();
     private Modality modality;
     private Visibility visibility;
-    private JetType superclassType;
     private final ClassKind kind;
     private ClassReceiver implicitReceiver;
 
@@ -83,16 +82,6 @@ public class JavaClassDescriptor extends MutableDeclarationDescriptor implements
         return new SubstitutingScope(unsubstitutedMemberScope, substitutor);
     }
 
-    @NotNull
-    @Override
-    public JetType getSuperclassType() {
-        return superclassType;
-    }
-
-    public void setSuperclassType(@NotNull JetType superclassType) {
-        this.superclassType = superclassType;
-    }
-
     @NotNull
     @Override
     public Set<ConstructorDescriptor> getConstructors() {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 6c11541235d..2dac8ce98c6 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -269,7 +269,7 @@ public class JavaDescriptorResolver {
 
         supertypes.addAll(getSupertypes(psiClass));
         if (psiClass.isInterface()) {
-            classData.classDescriptor.setSuperclassType(JetStandardClasses.getAnyType()); // TODO : Make it java.lang.Object
+            //classData.classDescriptor.setSuperclassType(JetStandardClasses.getAnyType()); // TODO : Make it java.lang.Object
         }
         else {
             PsiClassType[] extendsListTypes = psiClass.getExtendsListTypes();
@@ -277,7 +277,7 @@ public class JavaDescriptorResolver {
             JetType superclassType = extendsListTypes.length == 0
                                             ? JetStandardClasses.getAnyType()
                                             : semanticServices.getTypeTransformer().transformToType(extendsListTypes[0]);
-            classData.classDescriptor.setSuperclassType(superclassType);
+            //classData.classDescriptor.setSuperclassType(superclassType);
         }
 
         PsiMethod[] psiConstructors = psiClass.getConstructors();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
index be9e36b7696..230e58fdf12 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java
@@ -20,12 +20,6 @@ public interface ClassDescriptor extends ClassifierDescriptor, MemberDescriptor
     @NotNull
     JetScope getMemberScope(List<TypeProjection> typeArguments);
 
-    /**
-     * @return the superclass for a class descriptor, and the required class fro a trait descriptor
-     */
-    @NotNull
-    JetType getSuperclassType();
-
     @NotNull
     Set<ConstructorDescriptor> getConstructors();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java
index 3335f7520f1..030fa7ba9d3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorImpl.java
@@ -20,7 +20,6 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
     private JetScope memberDeclarations;
     private Set<ConstructorDescriptor> constructors;
     private ConstructorDescriptor primaryConstructor;
-    private JetType superclassType;
     private ReceiverDescriptor implicitReceiver;
 
     public ClassDescriptorImpl(
@@ -50,7 +49,6 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
         this.memberDeclarations = memberDeclarations;
         this.constructors = constructors;
         this.primaryConstructor = primaryConstructor;
-        this.superclassType = superclassType;
         return this;
     }
 
@@ -86,12 +84,6 @@ public class ClassDescriptorImpl extends DeclarationDescriptorImpl implements Cl
         return new SubstitutingScope(memberDeclarations, TypeSubstitutor.create(substitutionContext));
     }
 
-    @NotNull
-    @Override
-    public JetType getSuperclassType() {
-        return superclassType;
-    }
-
     @NotNull
     @Override
     public JetType getDefaultType() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java
index 70cf1405c27..adcd080266f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/LazySubstitutingClassDescriptor.java
@@ -81,15 +81,6 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
         return new SubstitutingScope(memberScope, getSubstitutor());
     }
 
-    @NotNull
-    @Override
-    public JetType getSuperclassType() {
-        if (superclassType == null) {
-            superclassType = getSubstitutor().substitute(original.getSuperclassType(), Variance.INVARIANT);
-        }
-        return superclassType;
-    }
-
     @NotNull
     @Override
     public JetType getDefaultType() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
index 4343f270286..3369c2e24f9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
@@ -347,17 +347,6 @@ public class MutableClassDescriptor extends MutableDeclarationDescriptor impleme
         return kind;
     }
 
-    @NotNull
-    @Override
-    public JetType getSuperclassType() {
-        return superclassType;
-    }
-
-    public void setSuperclassType(@NotNull JetType superclassType) {
-        this.superclassType = superclassType;
-    }
-
-
     public void setModality(Modality modality) {
         this.modality = modality;
     }