diff --git a/.idea/artifacts/KotlinBarePlugin.xml b/.idea/artifacts/KotlinBarePlugin.xml
deleted file mode 100644
index f9e2044d0a2..00000000000
--- a/.idea/artifacts/KotlinBarePlugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="KotlinBarePlugin">
-    <output-path>$PROJECT_DIR$/out/artifacts/BareKotlin</output-path>
-    <properties id="ant-postprocessing">
-      <options enabled="true">
-        <file>file://$PROJECT_DIR$/idea-runner/runner.xml</file>
-        <target>copy-runtime-for-idea-plugin</target>
-      </options>
-    </properties>
-    <root id="root">
-      <element id="directory" name="kotlinc">
-        <element id="dir-copy" path="$PROJECT_DIR$/dist/kotlinc" />
-      </element>
-      <element id="directory" name="lib">
-        <element id="archive" name="kotlin-bare-plugin.jar">
-          <element id="module-output" name="bare-plugin" />
-          <element id="module-output" name="descriptor.loader.java" />
-          <element id="module-output" name="frontend.java" />
-          <element id="module-output" name="descriptors" />
-        </element>
-        <element id="directory" name="jps">
-          <element id="artifact" artifact-name="KotlinJpsPlugin" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index e424833dd6f..16179a1165a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -14,7 +14,6 @@
       <module fileurl="file://$PROJECT_DIR$/ant/ant.iml" filepath="$PROJECT_DIR$/ant/ant.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/compiler/backend/backend.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/backend-common/backend-common.iml" filepath="$PROJECT_DIR$/compiler/backend-common/backend-common.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" filepath="$PROJECT_DIR$/jps-plugin/bare-plugin/bare-plugin.iml" group="ide/jps" />
       <module fileurl="file://$PROJECT_DIR$/build-common/build-common.iml" filepath="$PROJECT_DIR$/build-common/build-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/builtins/builtins.iml" filepath="$PROJECT_DIR$/core/builtins/builtins.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" filepath="$PROJECT_DIR$/compiler/builtins-serializer/builtins-serializer.iml" group="compiler/cli" />
diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index 84c7c2b55df..227a84207be 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -17,10 +17,6 @@
     <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
 
     <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
-    <property name="bare.plugin.zip" value="${artifact.output.path}/kotlin-bare-plugin-${build.number}.zip"/>
-
-    <property name="kotlin.bare.plugin.xml" value="jps-plugin/bare-plugin/src/META-INF/plugin.xml"/>
-    <property name="kotlin.bare.plugin.xml.bk" value="${version_substitute_dir}/kotlin.bare.plugin.xml.bk"/>
 
     <macrodef name="echoprop">
         <attribute name="prop"/>
@@ -90,17 +86,11 @@
                 target.file.versioned="${compiler.version.java.versioned}"
                 test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
 
-        <substituteVersionInFile
-                target.file="${kotlin.bare.plugin.xml}"
-                target.file.bk="${kotlin.bare.plugin.xml.bk}"
-                test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"/>
-
         </target>
 
     <target name="revertTemplateFiles">
         <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
         <copy file="${compiler.version.java.bk}" tofile="${compiler.version.java}" overwrite="true"/>
-        <copy file="${kotlin.bare.plugin.xml.bk}" tofile="${kotlin.bare.plugin.xml}" overwrite="true"/>
 
         <delete dir="${version_substitute_dir}" quiet="true"/>
     </target>
@@ -125,7 +115,6 @@
         </macrodef>
 
         <zipPlugin filename="${plugin.zip}" dir="Kotlin"/>
-        <zipPlugin filename="${bare.plugin.zip}" dir="BareKotlin"/>
     </target>
 
     <macrodef name="print-statistic">
diff --git a/TeamCityRelay.xml b/TeamCityRelay.xml
index b606998c738..357d03ca386 100644
--- a/TeamCityRelay.xml
+++ b/TeamCityRelay.xml
@@ -82,13 +82,6 @@
             plugin.subdir="Kotlin"
             substituted.version="${relay.substitute.version}"/>
 
-        <substitudeVersionInPlugin
-            plugin.jar.name="kotlin-bare-plugin"
-            plugin.path="${relay.plugins.dir}/kotlin-bare-plugin-${relay.origin.version}.zip"
-            origin.version="${relay.origin.version}"
-            plugin.subdir="BareKotlin"
-            substituted.version="${relay.substitute.version}"/>
-
         <substitudeVersionInPlugin
             plugin.jar.name="kotlin-android-extensions"
             plugin.path="${relay.plugins.dir}/kotlin-android-extensions-plugin-${relay.origin.version}.zip"
diff --git a/jps-plugin/bare-plugin/bare-plugin.iml b/jps-plugin/bare-plugin/bare-plugin.iml
deleted file mode 100644
index 11e5df07c16..00000000000
--- a/jps-plugin/bare-plugin/bare-plugin.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="idea-full" level="project" />
-    <orderEntry type="module" module-name="jps-plugin" />
-    <orderEntry type="library" name="kotlin-runtime" level="project" />
-    <orderEntry type="library" name="kotlin-reflect" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps-plugin/bare-plugin/src/META-INF/plugin.xml
deleted file mode 100644
index 12898ea9244..00000000000
--- a/jps-plugin/bare-plugin/src/META-INF/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<idea-plugin version="2" url="http://kotlinlang.org">
-    <id>org.jetbrains.kotlin.bare</id>
-
-    <name>Kotlin Bare Compiler for IntelliJ IDEA</name>
-    <description><![CDATA[
-        This plugin is intended for IntelliJ IDEA developers only. It should be installed along with main Kotlin plugin.
-        When main Kotlin plugin is disabled due to incompatibility with bleeding edge IntelliJ IDEA,
-        this plugin will still compile Kotlin sources.
-        <br />
-        This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled.]]>
-    </description>
-    <version>@snapshot@</version>
-    <vendor url="http://www.jetbrains.com">JetBrains s.r.o.</vendor>
-
-    <idea-version since-build="138.977" until-build="999.9999"/>
-
-    <application-components>
-        <component>
-            <implementation-class>org.jetbrains.kotlin.idea.bare.BareJpsPluginRegistrar</implementation-class>
-        </component>
-    </application-components>
-</idea-plugin>
diff --git a/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt b/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt
deleted file mode 100644
index 5e1eab70fb0..00000000000
--- a/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2010-2015 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.kotlin.idea.bare
-
-import com.intellij.compiler.server.CompileServerPlugin
-import com.intellij.ide.plugins.PluginManager
-import com.intellij.openapi.components.ApplicationComponent
-import com.intellij.openapi.extensions.Extensions
-import com.intellij.openapi.extensions.PluginId
-
-class BareJpsPluginRegistrar : ApplicationComponent {
-    override fun initComponent() {
-        val mainKotlinPlugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin"))
-
-        if (mainKotlinPlugin != null && mainKotlinPlugin.isEnabled) {
-            // do nothing
-        }
-        else {
-            val compileServerPlugin = CompileServerPlugin()
-            compileServerPlugin.classpath = "jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar"
-            compileServerPlugin.pluginDescriptor = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare"))
-
-            Extensions.getRootArea()
-                    .getExtensionPoint(CompileServerPlugin.EP_NAME)
-                    .registerExtension(compileServerPlugin)
-        }
-    }
-
-    override fun disposeComponent() {
-    }
-
-    override fun getComponentName(): String {
-        return javaClass.name
-    }
-}