diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java
index 7e03ca3f864..98c24eaca3e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotatedExpression.java
@@ -30,11 +30,6 @@ public class JetAnnotatedExpression extends JetExpressionImpl implements JetAnno
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitAnnotatedExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitAnnotatedExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java
index 06eab0e47b4..ac8ad668b5e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotation.java
@@ -27,11 +27,6 @@ public class JetAnnotation extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitAnnotation(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitAnnotation(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
index 66cbd2ca155..0d83c6d60cc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
@@ -42,11 +42,6 @@ public class JetAnnotationEntry extends JetElementImplStub<PsiJetAnnotationStub>
         super(stub, JetStubElementTypes.ANNOTATION_ENTRY);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitAnnotationEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitAnnotationEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
index dadb8b96415..cea66a26cd3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetArrayAccessExpression.java
@@ -20,9 +20,6 @@ import com.google.common.collect.Lists;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiReferenceService;
-import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,11 +34,6 @@ public class JetArrayAccessExpression extends JetReferenceExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitArrayAccessExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitArrayAccessExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java
index 87f67b9a42e..d38cf1dc1aa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpression.java
@@ -28,11 +28,6 @@ public class JetBinaryExpression extends JetExpressionImpl implements JetOperati
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitBinaryExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitBinaryExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java
index 0eb82ad72ae..f730ec15543 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBinaryExpressionWithTypeRHS.java
@@ -27,11 +27,6 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl implements
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitBinaryWithTypeRHSExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitBinaryWithTypeRHSExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java
index bbceac0a464..6b3b989448f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockExpression.java
@@ -37,11 +37,6 @@ public class JetBlockExpression extends JetExpressionImpl implements JetStatemen
         return JetModifiableBlockHelper.shouldChangeModificationCount(place);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitBlockExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitBlockExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java
index 16da6b7c784..17fa7dd1b17 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBlockStringTemplateEntry.java
@@ -24,11 +24,6 @@ public class JetBlockStringTemplateEntry extends JetStringTemplateEntryWithExpre
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitBlockStringTemplateEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitBlockStringTemplateEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java
index 5123e9eeb5f..7b422357fda 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java
@@ -24,11 +24,6 @@ public class JetBreakExpression extends JetLabelQualifiedExpression implements J
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitBreakExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitBreakExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java
index 3269e9ff092..4ec8e3e0efd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallExpression.java
@@ -32,11 +32,6 @@ public class JetCallExpression extends JetReferenceExpression implements JetCall
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitCallExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitCallExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java
index 1e348d158f7..a157ae176fa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableReferenceExpression.java
@@ -47,11 +47,6 @@ public class JetCallableReferenceExpression extends JetExpressionImpl {
         throw new IllegalStateException("Callable reference simple name shouldn't be parsed to null");
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitCallableReferenceExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitCallableReferenceExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java
index fbbdd0bc202..b9cc33c9448 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCatchClause.java
@@ -28,11 +28,6 @@ public class JetCatchClause extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitCatchSection(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitCatchSection(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
index 0d9f3113f2e..86aa3fb110c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
@@ -56,11 +56,6 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
         return body.getDeclarations();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitClass(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitClass(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
index 700b5dea0dc..c55a016fc4d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassBody.java
@@ -38,11 +38,6 @@ public class JetClassBody extends JetElementImpl implements JetDeclarationContai
         return PsiTreeUtil.getChildrenOfTypeAsList(this, JetDeclaration.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitClassBody(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitClassBody(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
index 0f681f4ba1e..4147a33fc51 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassInitializer.java
@@ -20,18 +20,12 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lexer.JetTokens;
 
 public class JetClassInitializer extends JetDeclarationImpl implements JetStatementExpression {
     public JetClassInitializer(@NotNull ASTNode node) {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitAnonymousInitializer(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitAnonymousInitializer(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java
index d5f60c8f3c1..e41cf84f7f5 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClassObject.java
@@ -28,11 +28,6 @@ public class JetClassObject extends JetDeclarationImpl implements JetStatementEx
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitClassObject(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitClassObject(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
index 9c4c4c1a3dc..a582f143eff 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetConstantExpression.java
@@ -24,11 +24,6 @@ public class JetConstantExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitConstantExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitConstantExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java
index d0f3cd702a1..ce9cd686f21 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java
@@ -24,11 +24,6 @@ public class JetContinueExpression extends JetLabelQualifiedExpression implement
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitContinueExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitContinueExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java
index 684814af14c..479e1dba7a9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifier.java
@@ -26,11 +26,6 @@ public class JetDelegationSpecifier extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationSpecifier(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationSpecifier(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java
index 05c0dc8aad3..b36d8fd07b9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegationSpecifierList.java
@@ -27,11 +27,6 @@ public class JetDelegationSpecifierList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationSpecifierList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationSpecifierList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java
index 61768ef900b..b531239455b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorByExpressionSpecifier.java
@@ -25,11 +25,6 @@ public class JetDelegatorByExpressionSpecifier extends JetDelegationSpecifier {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationByExpressionSpecifier(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationByExpressionSpecifier(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java
index acfbf443b3c..b1a9fb6ef4c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java
@@ -29,11 +29,6 @@ public class JetDelegatorToSuperCall extends JetDelegationSpecifier implements J
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationToSuperCallSpecifier(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationToSuperCallSpecifier(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java
index 8dfa28f7421..8c9b835c595 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperClass.java
@@ -24,11 +24,6 @@ public class JetDelegatorToSuperClass extends JetDelegationSpecifier {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationToSuperClassSpecifier(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationToSuperClassSpecifier(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java
index 359a8f50e5b..505e9a809a0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToThisCall.java
@@ -30,11 +30,6 @@ public class JetDelegatorToThisCall extends JetDelegationSpecifier implements Je
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDelegationToThisCall(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDelegationToThisCall(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java
index 9c01aae1eff..bbd431f232c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDoWhileExpression.java
@@ -24,11 +24,6 @@ public class JetDoWhileExpression extends JetWhileExpressionBase {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDoWhileExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDoWhileExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
index 3bec164d01a..ce20935f714 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java
@@ -24,11 +24,6 @@ public class JetDotQualifiedExpression extends JetQualifiedExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitDotQualifiedExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitDotQualifiedExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java
index eb87207259c..849ea818250 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetElement.java
@@ -22,7 +22,5 @@ import org.jetbrains.annotations.NotNull;
 public interface JetElement extends NavigatablePsiElement {
     <D> void acceptChildren(@NotNull JetTreeVisitor<D> visitor, D data);
 
-    void accept(@NotNull JetVisitorVoid visitor);
-
     <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data);
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
index cec075a8379..ed29be4a01d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
@@ -77,11 +77,6 @@ public class JetEnumEntry extends JetClass {
         return initializerList.getInitializers();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitEnumEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitEnumEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java
index 27af3fd73d0..8b4b065fd4e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEscapeStringTemplateEntry.java
@@ -25,11 +25,6 @@ public class JetEscapeStringTemplateEntry extends JetStringTemplateEntry {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitEscapeStringTemplateEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitEscapeStringTemplateEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java
index 8848f4c387a..0ed62ea7b6e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpression.java
@@ -19,9 +19,6 @@ package org.jetbrains.jet.lang.psi;
 import org.jetbrains.annotations.NotNull;
 
 public interface JetExpression extends JetElement {
-    @Override
-    void accept(@NotNull JetVisitorVoid visitor);
-
     @Override
     <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data);
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java
index cd86f8569ad..31ee9b2bdd2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionImpl.java
@@ -27,11 +27,6 @@ public abstract class JetExpressionImpl extends JetElementImpl implements JetExp
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java
index f205dc1c5bb..e54f9f117ce 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFinallySection.java
@@ -25,11 +25,6 @@ public class JetFinallySection extends JetElementImpl implements JetStatementExp
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitFinallySection(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitFinallySection(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
index 01cbbc64ead..9b38f2fc360 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetForExpression.java
@@ -27,11 +27,6 @@ public class JetForExpression extends JetLoopExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitForExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitForExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java
index b65423eab4f..0ea2ec7e514 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java
@@ -29,11 +29,6 @@ public class JetFunctionLiteralExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitFunctionLiteralExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitFunctionLiteralExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java
index ded0da5a48f..3e64f25f47b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionType.java
@@ -54,11 +54,6 @@ public class JetFunctionType extends JetTypeElement {
         return result;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitFunctionType(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitFunctionType(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java
index f56e8f82237..ca97a616510 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIfExpression.java
@@ -26,11 +26,6 @@ public class JetIfExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitIfExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitIfExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
index 0dbb24a3064..361d092d757 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
@@ -27,11 +27,6 @@ public class JetImportDirective extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitImportDirective(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitImportDirective(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java
index b3e38f74d7b..045ee1789fb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetImportList.java
@@ -28,11 +28,6 @@ public class JetImportList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitImportList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitImportList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java
index d4cdb7e578a..74c20f4d884 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInitializerList.java
@@ -27,11 +27,6 @@ public class JetInitializerList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitInitializerList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitInitializerList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java
index 272082a9ac8..e1bad365b07 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetIsExpression.java
@@ -27,11 +27,6 @@ public class JetIsExpression extends JetExpressionImpl implements JetOperationEx
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitIsExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitIsExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java
index 7b28937f653..cf8f001e412 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLiteralStringTemplateEntry.java
@@ -24,11 +24,6 @@ public class JetLiteralStringTemplateEntry extends JetStringTemplateEntry {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitLiteralStringTemplateEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitLiteralStringTemplateEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
index bd9ae176367..7cba39871b8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifierList.java
@@ -34,11 +34,6 @@ public class JetModifierList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitModifierList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitModifierList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java
index 0dad5633e66..698b558d871 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclaration.java
@@ -32,11 +32,6 @@ public class JetMultiDeclaration extends JetDeclarationImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitMultiDeclaration(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitMultiDeclaration(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
index a899e579202..73e4023f127 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java
@@ -36,11 +36,6 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl
         return (JetTypeReference) findChildByType(JetNodeTypes.TYPE_REFERENCE);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitMultiDeclarationEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitMultiDeclarationEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
index c6f2e7a17cc..a8301852c4b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
@@ -44,11 +44,6 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
         super(stub, JetStubElementTypes.FUNCTION);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitNamedFunction(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitNamedFunction(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java
index d4db2cded89..1bbf9d0260c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNullableType.java
@@ -38,11 +38,6 @@ public class JetNullableType extends JetTypeElement {
         return getInnerType().getTypeArgumentsAsTypes();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitNullableType(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitNullableType(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
index d8ad1dbde64..9d40506a5a6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -162,11 +162,6 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
         return body.getDeclarations();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitObjectDeclaration(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitObjectDeclaration(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java
index 7df092981ed..0c708fbef1b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclarationName.java
@@ -58,11 +58,6 @@ public class JetObjectDeclarationName extends JetExpressionImpl {
         return identifier != null ? identifier.getTextRange().getStartOffset() : getTextRange().getStartOffset();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitObjectDeclarationName(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitObjectDeclarationName(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java
index 4b4af6017d2..eb2873c8c74 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectLiteralExpression.java
@@ -25,11 +25,6 @@ public class JetObjectLiteralExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitObjectLiteralExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitObjectLiteralExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
index 296ef03e3f4..d6f82ec8f4a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -52,11 +52,6 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
         return JetStubElementTypes.VALUE_PARAMETER;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitParameter(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitParameter(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
index aca875915a1..ea6d9610077 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
@@ -40,11 +40,6 @@ public class JetParameterList extends JetElementImplStub<PsiJetParameterListStub
         return JetStubElementTypes.VALUE_PARAMETER_LIST;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitParameterList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitParameterList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java
index 623ed3401b5..b0ee6856128 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParenthesizedExpression.java
@@ -25,11 +25,6 @@ public class JetParenthesizedExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitParenthesizedExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitParenthesizedExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java
index 1d2a19d0362..639fd51f36b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPostfixExpression.java
@@ -31,11 +31,6 @@ public class JetPostfixExpression extends JetUnaryExpression {
         return answer;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitPostfixExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitPostfixExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java
index 99782ec911d..2345f694f68 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPrefixExpression.java
@@ -26,11 +26,6 @@ public class JetPrefixExpression extends JetUnaryExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitPrefixExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitPrefixExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
index 37d8c331753..c11a4cc3956 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -20,8 +20,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.search.LocalSearchScope;
-import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
@@ -49,11 +47,6 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
         super(stub, nodeType);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitProperty(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitProperty(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java
index e27f8df8d46..fccd30ce566 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java
@@ -33,11 +33,6 @@ public class JetPropertyAccessor extends JetDeclarationImpl
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitPropertyAccessor(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitPropertyAccessor(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java
index a6ab4413239..5d4a871dc5f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyDelegate.java
@@ -17,9 +17,6 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.PsiReferenceService;
-import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -34,11 +31,6 @@ public class JetPropertyDelegate extends JetElementImpl {
         return findChildByClass(JetExpression.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitPropertyDelegate(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitPropertyDelegate(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java
index accee36e7d1..a05109848d1 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java
@@ -25,11 +25,6 @@ public class JetReturnExpression extends JetLabelQualifiedExpression implements
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitReturnExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitReturnExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java
index 49da34b0c50..3c417286dfd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetRootPackageExpression.java
@@ -24,11 +24,6 @@ public class JetRootPackageExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitRootPackageExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitRootPackageExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java
index 5429806ea0f..760a2d95682 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java
@@ -24,11 +24,6 @@ public class JetSafeQualifiedExpression extends JetQualifiedExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitSafeQualifiedExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitSafeQualifiedExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java
index d1fd2183e44..7e8b378a0b7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetScript.java
@@ -51,11 +51,6 @@ public class JetScript extends JetDeclarationImpl {
         return PsiTreeUtil.getChildrenOfTypeAsList(getBlockExpression(), JetDeclaration.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitScript(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitScript(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java
index 34811124cca..a5ccd9f5ec0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSelfType.java
@@ -33,11 +33,6 @@ public class JetSelfType extends JetTypeElement {
         return Collections.emptyList();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitSelfType(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitSelfType(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
index 7fea20edba5..238736e3d9c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameExpression.java
@@ -115,11 +115,6 @@ public class JetSimpleNameExpression extends JetReferenceExpression {
         return getReferencedNameElement().getNode().getElementType();
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitSimpleNameExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitSimpleNameExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java
index 4fd024383fb..7ce401c8c63 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSimpleNameStringTemplateEntry.java
@@ -25,11 +25,6 @@ public class JetSimpleNameStringTemplateEntry extends JetStringTemplateEntryWith
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitSimpleNameStringTemplateEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitSimpleNameStringTemplateEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java
index 086a6135fb6..73265403935 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateEntryWithExpression.java
@@ -24,11 +24,6 @@ public abstract class JetStringTemplateEntryWithExpression extends JetStringTemp
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitStringTemplateEntryWithExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitStringTemplateEntryWithExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java
index 2d9d38ec9ca..6ccfb13c7d9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetStringTemplateExpression.java
@@ -24,11 +24,6 @@ public class JetStringTemplateExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitStringTemplateExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitStringTemplateExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java
index 35821b9a70d..252e0a429cb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java
@@ -27,11 +27,6 @@ public class JetSuperExpression extends JetLabelQualifiedInstanceExpression impl
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitSuperExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitSuperExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
index 2fe386660cb..2b31a3f2bd6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java
@@ -25,11 +25,6 @@ public class JetThisExpression extends JetLabelQualifiedInstanceExpression {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitThisExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitThisExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java
index 0ea49d0a8b3..81493680f6c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThrowExpression.java
@@ -25,11 +25,6 @@ public class JetThrowExpression extends JetExpressionImpl implements JetStatemen
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitThrowExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitThrowExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java
index afb16d851d4..42a3211e734 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTryExpression.java
@@ -28,11 +28,6 @@ public class JetTryExpression extends JetExpressionImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTryExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTryExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java
index 2003d1eb420..36912348302 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeArgumentList.java
@@ -27,11 +27,6 @@ public class JetTypeArgumentList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeArgumentList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeArgumentList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
index 2874d725215..8c95d462c7c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraint.java
@@ -28,11 +28,6 @@ public class JetTypeConstraint extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeConstraint(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeConstraint(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java
index 5efde200962..30552e026e0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeConstraintList.java
@@ -27,11 +27,6 @@ public class JetTypeConstraintList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeConstraintList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeConstraintList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
index 22a01dffef3..74762eefcc3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
@@ -45,11 +45,6 @@ public class JetTypeParameter extends JetNamedDeclarationStub<PsiJetTypeParamete
         super(stub, nodeType);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeParameter(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeParameter(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
index a45302790c9..1cf2e30960f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
@@ -45,11 +45,6 @@ public class JetTypeParameterList extends JetElementImplStub<PsiJetTypeParameter
         return JetStubElementTypes.TYPE_PARAMETER_LIST;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeParameterList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeParameterList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
index b3467437ced..068d68cb268 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeProjection.java
@@ -55,11 +55,6 @@ public class JetTypeProjection extends JetElementImpl implements JetModifierList
         throw new IllegalStateException(projectionNode.getText());
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeProjection(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeProjection(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java
index 963f5b7cbd9..c8ee41f4d5c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeReference.java
@@ -34,11 +34,6 @@ public class JetTypeReference extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypeReference(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeReference(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java
index 2a10aeb2c0f..02aab712489 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypedef.java
@@ -26,11 +26,6 @@ public class JetTypedef extends JetTypeParameterListOwnerNotStubbed {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitTypedef(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypedef(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java
index e38c25ec868..dfdc991eecb 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetUserType.java
@@ -35,11 +35,6 @@ public class JetUserType extends JetTypeElement {
         return findChildByType(JetTokens.PACKAGE_KEYWORD) != null;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitUserType(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitUserType(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java
index 5ac8ba7d803..05e3c392b36 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgument.java
@@ -29,10 +29,6 @@ public class JetValueArgument extends JetElementImpl implements ValueArgument {
         super(node);
     }
 
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitArgument(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitArgument(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java
index 41b46fc5043..4b0a8e9e6ff 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetValueArgumentList.java
@@ -30,11 +30,6 @@ public class JetValueArgumentList extends JetElementImpl {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitValueArgumentList(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitValueArgumentList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java
index ff6632b7e66..63906b783f4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionInRange.java
@@ -47,11 +47,6 @@ public class JetWhenConditionInRange extends JetWhenCondition {
         return null;
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhenConditionInRange(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhenConditionInRange(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java
index d45d53971d1..93db7c30785 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionIsPattern.java
@@ -36,11 +36,6 @@ public class JetWhenConditionIsPattern extends JetWhenCondition {
         return (JetTypeReference) findChildByType(JetNodeTypes.TYPE_REFERENCE);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhenConditionIsPattern(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhenConditionIsPattern(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
index 7381e50c97b..3d06cbbc989 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenConditionWithExpression.java
@@ -31,11 +31,6 @@ public class JetWhenConditionWithExpression extends JetWhenCondition {
         return findChildByClass(JetExpression.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhenConditionWithExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhenConditionWithExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java
index bef67720a2b..dc62e7b3935 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenEntry.java
@@ -41,11 +41,6 @@ public class JetWhenEntry extends JetElementImpl {
         return findChildByClass(JetExpression.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhenEntry(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhenEntry(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
index 7ff507478bf..59d6e08d1b4 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhenExpression.java
@@ -40,11 +40,6 @@ public class JetWhenExpression extends JetExpressionImpl {
         return findChildByClass(JetExpression.class);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhenExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhenExpression(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
index 1c1ae2ecc20..8f9218064a6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetWhileExpression.java
@@ -24,11 +24,6 @@ public class JetWhileExpression extends JetWhileExpressionBase {
         super(node);
     }
 
-    @Override
-    public void accept(@NotNull JetVisitorVoid visitor) {
-        visitor.visitWhileExpression(this);
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitWhileExpression(this, data);