diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3820112ad89..3e6f1921a06 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -249,19 +249,11 @@
                             order="first"
                             implementationClass="org.jetbrains.jet.plugin.completion.KotlinCompletionContributor"/>
 
-    <completion.contributor language="jet"
-                            id="JetLiveTemplateCompletionContributor"
-                            order="after JetCompletionContributor"
-                            implementationClass="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor"/>
-
     <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.UnfocusedNameIdentifier"/>
     <completion.confidence language="jet"
                            implementationClass="org.jetbrains.jet.plugin.completion.confidence.UnfocusedPossibleFunctionParameter"/>
     <completion.confidence language="jet" implementationClass="com.intellij.codeInsight.completion.AlwaysFocusLookup" order="last"/>
 
-    <completion.skip implementation="org.jetbrains.jet.plugin.liveTemplates.JetLiveTemplateCompletionContributor$Skipper"
-                     id="skipLiveTemplate"/>
-
     <lookup.charFilter implementation="org.jetbrains.jet.plugin.completion.KotlinCompletionCharFilter"/>
 
     <psi.referenceContributor language="jet" implementation="org.jetbrains.jet.plugin.references.JetReferenceContributor"/>
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
deleted file mode 100644
index 836ba09cf1d..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.plugin.liveTemplates;
-
-import com.intellij.codeInsight.completion.*;
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.codeInsight.template.TemplateContextType;
-import com.intellij.codeInsight.template.impl.*;
-import com.intellij.openapi.util.Ref;
-import com.intellij.patterns.PlatformPatterns;
-import com.intellij.psi.PsiFile;
-import com.intellij.util.Consumer;
-import com.intellij.util.ProcessingContext;
-import com.intellij.util.containers.ContainerUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-public class JetLiveTemplateCompletionContributor extends CompletionContributor {
-    public JetLiveTemplateCompletionContributor() {
-        extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<CompletionParameters>() {
-            @Override
-            protected void addCompletions(@NotNull CompletionParameters parameters,
-                                          ProcessingContext context,
-                                          @NotNull final CompletionResultSet result) {
-                if (parameters.getInvocationCount() == 0) return;
-
-                PsiFile file = parameters.getPosition().getContainingFile();
-                int offset = parameters.getOffset();
-                final List<TemplateImpl> templates = listApplicableTemplates(file, offset);
-                final Ref<Boolean> templatesShown = Ref.create(false);
-
-                result.runRemainingContributors(parameters, new Consumer<CompletionResult>() {
-                    @Override
-                    public void consume(CompletionResult completionResult) {
-                        result.passResult(completionResult);
-                        ensureTemplatesShown(templatesShown, templates, result);
-                    }
-                });
-
-                ensureTemplatesShown(templatesShown, templates, result);
-            }
-        });
-    }
-
-    private static void ensureTemplatesShown(Ref<Boolean> templatesShown, List<TemplateImpl> templates, CompletionResultSet result) {
-        if (!templatesShown.get()) {
-            templatesShown.set(true);
-            for (TemplateImpl possible : templates) {
-                result.addElement(new LiveTemplateLookupElementImpl(possible, false));
-            }
-        }
-    }
-
-    private static List<TemplateImpl> listApplicableTemplates(PsiFile file, int offset) {
-        Set<TemplateContextType> contextTypes = TemplateManagerImpl.getApplicableContextTypes(file, offset);
-
-        ArrayList<TemplateImpl> result = ContainerUtil.newArrayList();
-        for (TemplateImpl template : TemplateSettings.getInstance().getTemplates()) {
-            if (!template.isDeactivated() && !template.isSelectionTemplate() && TemplateManagerImpl.isApplicable(template, contextTypes)) {
-                result.add(template);
-            }
-        }
-        return result;
-    }
-
-    public static class Skipper extends CompletionPreselectSkipper {
-
-        @Override
-        public boolean skipElement(LookupElement element, CompletionLocation location) {
-            return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement) element).sudden;
-        }
-    }
-}
diff --git a/idea/testData/completion/weighers/basic/ExactMatchForKeyword.kt b/idea/testData/completion/weighers/basic/ExactMatchForKeyword.kt
index 6bd32422189..37afaa2932c 100644
--- a/idea/testData/completion/weighers/basic/ExactMatchForKeyword.kt
+++ b/idea/testData/completion/weighers/basic/ExactMatchForKeyword.kt
@@ -7,5 +7,4 @@ fun test() {
 // ORDER: if
 // ORDER: ifMore
 // ORDER: isFirst
-// ORDER: ifn
 // SELECTED: 0
\ No newline at end of file