diff --git a/idea/src/org/jetbrains/jet/JetNodeTypes.java b/idea/src/org/jetbrains/jet/JetNodeTypes.java
index fe859340c02..916b6b79ed9 100644
--- a/idea/src/org/jetbrains/jet/JetNodeTypes.java
+++ b/idea/src/org/jetbrains/jet/JetNodeTypes.java
@@ -98,7 +98,6 @@ public interface JetNodeTypes {
     JetNodeType BINARY_EXPRESSION         = new JetNodeType("BINARY_EXPRESSION", JetBinaryExpression.class);
     JetNodeType BINARY_WITH_TYPE          = new JetNodeType("BINARY_WITH_TYPE", JetBinaryExpressionWithTypeRHS.class);
     JetNodeType BINARY_WITH_PATTERN       = new JetNodeType("BINARY_WITH_PATTERN", JetExpression.class); // TODO:
-    JetNodeType MATCH_EXPRESSION          = new JetNodeType("MATCH_EXPRESSION", JetMatchExpression.class);
     JetNodeType PREFIX_EXPRESSION         = new JetNodeType("PREFIX_EXPRESSION", JetPrefixExpression.class);
     JetNodeType POSTFIX_EXPRESSION        = new JetNodeType("POSTFIX_EXPRESSION", JetPostfixExpression.class);
     JetNodeType CALL_EXPRESSION           = new JetNodeType("CALL_EXPRESSION", JetCallExpression.class);
@@ -107,8 +106,6 @@ public interface JetNodeTypes {
     JetNodeType DOT_QIALIFIED_EXPRESSION  = new JetNodeType("DOT_QIALIFIED_EXPRESSION", JetDotQualifiedExpression.class);
     JetNodeType HASH_QIALIFIED_EXPRESSION = new JetNodeType("HASH_QIALIFIED_EXPRESSION", JetHashQualifiedExpression.class);
     JetNodeType SAFE_ACCESS_EXPRESSION    = new JetNodeType("SAFE_ACCESS_EXPRESSION", JetSafeQualifiedExpression.class);
-    JetNodeType MATCH_BLOCK               = new JetNodeType("MATCH_BLOCK", JetMatchBlock.class);
-    JetNodeType MATCH_ENTRY               = new JetNodeType("MATCH_ENTRY");
     JetNodeType DECOMPOSER_PATTERN        = new JetNodeType("DECOMPOSER_PATTERN");
     JetNodeType TUPLE_PATTERN             = new JetNodeType("TUPLE_PATTERN");
     JetNodeType OBJECT_LITERAL            = new JetNodeType("OBJECT_LITERAL", JetObjectLiteralExpression.class);
diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index 00c3f690cab..db777064e7c 100644
--- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -156,7 +156,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
 
         /**
          *
-         * @param operation the operation sign (e.g. PLUS or IS
+         * @param operation the operation sign (e.g. PLUS or IS)
          * @param parser the parser object
          * @return node type of the result
          */
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetDeclaration.java b/idea/src/org/jetbrains/jet/lang/psi/JetDeclaration.java
index 9b6a987e71b..4d8a198eef2 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetDeclaration.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetDeclaration.java
@@ -1,7 +1,6 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElementVisitor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetMatchBlock.java b/idea/src/org/jetbrains/jet/lang/psi/JetMatchBlock.java
deleted file mode 100644
index 53b271cd895..00000000000
--- a/idea/src/org/jetbrains/jet/lang/psi/JetMatchBlock.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jetbrains.jet.lang.psi;
-
-import com.intellij.lang.ASTNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * @author max
- */
-public class JetMatchBlock extends JetElement {
-    public JetMatchBlock(@NotNull ASTNode node) {
-        super(node);
-    }
-
-    @Override
-    public void accept(JetVisitor visitor) {
-        visitor.visitMatchBlock(this);
-    }
-}
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetMatchExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetMatchExpression.java
deleted file mode 100644
index 3667969103c..00000000000
--- a/idea/src/org/jetbrains/jet/lang/psi/JetMatchExpression.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.jetbrains.jet.lang.psi;
-
-import com.intellij.lang.ASTNode;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.JetNodeTypes;
-
-/**
- * @author max
- */
-public class JetMatchExpression extends JetExpression {
-    public JetMatchExpression(@NotNull ASTNode node) {
-        super(node);
-    }
-
-    @Override
-    public void accept(JetVisitor visitor) {
-        visitor.visitMatchExpression(this);
-    }
-
-    @NotNull
-    public JetExpression getTestedExpression() {
-        JetExpression left = findChildByClass(JetExpression.class);
-        assert left != null;
-        return left;
-    }
-
-    @Nullable @IfNotParsed
-    public JetMatchBlock getMatchBlock() {
-        return (JetMatchBlock) findChildByType(JetNodeTypes.MATCH_BLOCK);
-    }
-}
diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
index 0e7197b1319..a5e9c5058a9 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
@@ -310,14 +310,6 @@ public class JetVisitor extends PsiElementVisitor {
         visitExpression(expression);
     }
 
-    public void visitMatchExpression(JetMatchExpression expression) {
-        visitExpression(expression);
-    }
-
-    public void visitMatchBlock(JetMatchBlock block) {
-        visitJetElement(block);
-    }
-
     public void visitNamedDeclaration(JetNamedDeclaration declaration) {
         visitJetElement(declaration);
     }