diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java
index 3d1b070316b..b0b1096b3d7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java
@@ -86,32 +86,12 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<KotlinObjectSt
         return (JetObjectDeclarationName) findChildByType(JetNodeTypes.OBJECT_DECLARATION_NAME);
     }
 
-    @Override
-    @Nullable
-    public JetModifierList getModifierList() {
-        if (isClassObject()) {
-            PsiElement parent = getParentByStub();
-            assert parent instanceof JetDeclaration;
-            return ((JetDeclaration)parent).getModifierList();
-        }
-        return super.getModifierList();
-    }
-
     public boolean isClassObject() {
         KotlinObjectStub stub = getStub();
         if (stub != null) {
             return stub.isClassObject();
         }
-        PsiElement parent = getParent();
-        return parent != null && parent.getNode().getElementType().equals(JetNodeTypes.CLASS_OBJECT);
-    }
-
-    @Nullable
-    public JetClassObject getClassObjectElement() {
-        if (!isClassObject()) {
-            return null;
-        }
-        return (JetClassObject) getParentByStub();
+        return getClassKeyword() != null;
     }
 
     @Override
@@ -188,6 +168,11 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<KotlinObjectSt
         return findChildByType(JetTokens.OBJECT_KEYWORD);
     }
 
+    @Nullable
+    public PsiElement getClassKeyword() {
+        return findChildByType(JetTokens.CLASS_KEYWORD);
+    }
+
     @Override
     public void delete() throws IncorrectOperationException {
         JetPsiUtil.deleteClass(this);