diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java
index b72b96b51db..03482399ba0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -44,11 +42,6 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         super(debugName);
     }
 
-    @Override
-    public PsiJetClassStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetClass createPsi(@NotNull PsiJetClassStub stub) {
         return new JetClass(stub);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
index 88721f682fe..d8b8b967d7e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFunctionElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -47,11 +45,6 @@ public class JetFunctionElementType extends JetStubElementType<PsiJetFunctionStu
         return new JetNamedFunction(node);
     }
 
-    @Override
-    public PsiJetFunctionStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetNamedFunction createPsi(@NotNull PsiJetFunctionStub stub) {
         return new JetNamedFunction(stub);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
index d0198bd6306..e3ba78188f8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -47,11 +45,6 @@ public class JetParameterElementType extends JetStubElementType<PsiJetParameterS
         return new JetParameter(node);
     }
 
-    @Override
-    public PsiJetParameterStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetParameter createPsi(@NotNull PsiJetParameterStub stub) {
         return new JetParameter(stub, JetStubElementTypes.VALUE_PARAMETER);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterListElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterListElementType.java
index a506895260f..3635ce6b146 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterListElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetParameterListElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -44,11 +42,6 @@ public class JetParameterListElementType extends JetStubElementType<PsiJetParame
         return new JetParameterList(node);
     }
 
-    @Override
-    public PsiJetParameterListStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetParameterList createPsi(@NotNull PsiJetParameterListStub stub) {
         return new JetParameterList(stub, JetStubElementTypes.VALUE_PARAMETER_LIST);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
index c4574016fa7..9b06f792668 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -47,11 +45,6 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
         return new JetProperty(node);
     }
 
-    @Override
-    public PsiJetPropertyStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetProperty createPsi(@NotNull PsiJetPropertyStub stub) {
         return new JetProperty(stub, JetStubElementTypes.PROPERTY);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
index 9bde1161caf..c60e6b56775 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetStubElementType.java
@@ -18,10 +18,7 @@ package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.impl.java.stubs.PsiJavaFileStub;
-import com.intellij.psi.impl.java.stubs.StubPsiFactory;
-import com.intellij.psi.stubs.ILightStubElementType;
-import com.intellij.psi.stubs.PsiFileStub;
+import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -30,8 +27,7 @@ import org.jetbrains.jet.plugin.JetLanguage;
 /**
  * @author Nikolay Krasko
  */
-public abstract class JetStubElementType<StubT extends StubElement, PsiT extends PsiElement>
-        extends ILightStubElementType<StubT, PsiT> {
+public abstract class JetStubElementType<StubT extends StubElement, PsiT extends PsiElement> extends IStubElementType<StubT, PsiT> {
 
     public JetStubElementType(@NotNull @NonNls String debugName) {
         super(debugName, JetLanguage.INSTANCE);
@@ -39,19 +35,6 @@ public abstract class JetStubElementType<StubT extends StubElement, PsiT extends
 
     public abstract PsiT createPsiFromAst(@NotNull ASTNode node);
 
-    protected StubPsiFactory getPsiFactory(StubT stub) {
-        return getFileStub(stub).getPsiFactory();
-    }
-
-    private PsiJavaFileStub getFileStub(StubT stub) {
-        StubElement parent = stub;
-        while (!(parent instanceof PsiFileStub)) {
-            parent = parent.getParentStub();
-        }
-
-        return (PsiJavaFileStub)parent;
-    }
-
     @Override
     public String getExternalId() {
         return "jet." + toString();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
index cc3006b717f..b0e1fec6b9d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -47,11 +45,6 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
         return new JetTypeParameter(node);
     }
 
-    @Override
-    public PsiJetTypeParameterStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetTypeParameter createPsi(@NotNull PsiJetTypeParameterStub stub) {
         return new JetTypeParameter(stub, JetStubElementTypes.TYPE_PARAMETER);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterListElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterListElementType.java
index 5d0a49a79a0..1f5525cea4a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterListElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterListElementType.java
@@ -17,8 +17,6 @@
 package org.jetbrains.jet.lang.psi.stubs.elements;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.lang.LighterAST;
-import com.intellij.lang.LighterASTNode;
 import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
@@ -44,11 +42,6 @@ public class JetTypeParameterListElementType extends JetStubElementType<PsiJetTy
         return new JetTypeParameterList(node);
     }
 
-    @Override
-    public PsiJetTypeParameterListStub createStub(LighterAST tree, LighterASTNode node, StubElement parentStub) {
-        return null;
-    }
-
     @Override
     public JetTypeParameterList createPsi(@NotNull PsiJetTypeParameterListStub stub) {
         return new JetTypeParameterList(stub, JetStubElementTypes.TYPE_PARAMETER_LIST);