diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
index 4f5f88ebb3b..8f30982abfd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
@@ -336,8 +336,6 @@ public interface Errors {
     DiagnosticFactory1<PsiElement, SolutionStatus> TYPE_INFERENCE_FAILED = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<JetElement, Integer> WRONG_NUMBER_OF_TYPE_ARGUMENTS = DiagnosticFactory1.create(ERROR);
 
-    DiagnosticFactory1<JetIdeTemplateExpression, String> UNRESOLVED_IDE_TEMPLATE = DiagnosticFactory1.create(ERROR);
-
     SimpleDiagnosticFactory<JetExpression> DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED = SimpleDiagnosticFactory.create(WARNING);
 
     DiagnosticFactory1<JetAnnotationEntry, String> NOT_AN_ANNOTATION_CLASS = DiagnosticFactory1.create(ERROR);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
index c2f601fb248..9f3ece958b3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
@@ -398,8 +398,6 @@ public class DefaultErrorMessages {
         MAP.put(TYPE_INFERENCE_FAILED, "Type inference failed: {0}", TO_STRING);
         MAP.put(WRONG_NUMBER_OF_TYPE_ARGUMENTS, "{0,choice,0#No type arguments|1#Type argument|1<{0,number,integer} type argument} expected", null);
 
-        MAP.put(UNRESOLVED_IDE_TEMPLATE, "Unresolved IDE template: {0}", TO_STRING);
-
         MAP.put(DANGLING_FUNCTION_LITERAL_ARGUMENT_SUSPECTED,
                 "This expression is treated as an argument to the function call on the previous line. " +
                 "Separate it with a semicolon (;) if it is not intended to be an argument.");
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
index b36d7ee6a10..ec3ac80f27a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java
@@ -901,12 +901,6 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
         }
     }
 
-    @Override
-    public JetTypeInfo visitIdeTemplateExpression(JetIdeTemplateExpression expression, ExpressionTypingContext context) {
-        context.trace.report(UNRESOLVED_IDE_TEMPLATE.on(expression, ObjectUtils.notNull(expression.getText(), "<no name>")));
-        return JetTypeInfo.create(null, context.dataFlowInfo);
-    }
-
     @Override
     public JetTypeInfo visitBinaryExpression(JetBinaryExpression expression, ExpressionTypingContext contextWithExpectedType) {
         ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
index 1e7a3a14883..52285f4e6f9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java
@@ -311,10 +311,4 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito
     public JetTypeInfo visitUnaryExpression(JetUnaryExpression expression, ExpressionTypingContext context) {
         return basic.visitUnaryExpression(expression, context, true);
     }
-
-    @Override
-    public JetTypeInfo visitIdeTemplateExpression(JetIdeTemplateExpression expression, ExpressionTypingContext context) {
-        context.trace.report(UNRESOLVED_IDE_TEMPLATE.on(expression, ObjectUtils.notNull(expression.getText(), "<no name>")));
-        return JetTypeInfo.create(null, context.dataFlowInfo);
-    }
 }
diff --git a/compiler/testData/diagnostics/tests/IdeTemplates.jet b/compiler/testData/diagnostics/tests/IdeTemplates.jet
deleted file mode 100644
index c70c6c06def..00000000000
--- a/compiler/testData/diagnostics/tests/IdeTemplates.jet
+++ /dev/null
@@ -1,41 +0,0 @@
-fun main(args : Array<String>) {
-    if (<!UNRESOLVED_IDE_TEMPLATE!><#<condition>#><!>) {
-        <!UNRESOLVED_IDE_TEMPLATE!><#<block>#><!>
-    } else {
-        <!UNRESOLVED_IDE_TEMPLATE!><#<block>#><!>
-    }
-
-    fun <!UNRESOLVED_IDE_TEMPLATE!><#<name>#><!>(<#<params>#>) : <#<returnType>#> {
-        <#<body>#>
-    }
-
-    for (<#<i>#> in <!UNRESOLVED_IDE_TEMPLATE!><#<elements>#><!>) {
-        <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-    }
-
-    when (<!UNRESOLVED_IDE_TEMPLATE!><#<expression>#><!>) {
-        <!UNRESOLVED_IDE_TEMPLATE!><#<condition>#><!> -> <#<value>#>
-        else -> <!UNRESOLVED_IDE_TEMPLATE!><#<elseValue>#><!>
-    }
-
-    var <#<name>#> = <!UNRESOLVED_IDE_TEMPLATE!><#<value>#><!>
-
-    class <#<name>#> {
-        <#<body>#>
-    }
-
-    class <#<name>#> {
-        var <#<name>#> : <#<varType>#>
-        get() {
-            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }
-        set(value) {
-            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }
-
-        val <#<name>#> : <#<valType>#>
-        get() {
-            <!UNRESOLVED_IDE_TEMPLATE!><#<body>#><!>
-        }
-    }
-}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
index 55635016e5c..4f338482a61 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
@@ -145,9 +145,6 @@ public class JetPsiChecker implements Annotator {
         if (!diagnostic.isValid()) return;
         List<TextRange> textRanges = diagnostic.getTextRanges();
         if (diagnostic.getSeverity() == Severity.ERROR) {
-            if (diagnostic.getFactory() == Errors.UNRESOLVED_IDE_TEMPLATE) {
-                return;
-            }
             if (diagnostic.getFactory() instanceof UnresolvedReferenceDiagnosticFactory) {
                 JetReferenceExpression referenceExpression = (JetReferenceExpression)diagnostic.getPsiElement();
                 PsiReference reference = referenceExpression.getReference();