diff --git a/.idea/ant.xml b/.idea/ant.xml
index 03aca0fe21b..f128e62d687 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -42,30 +42,6 @@
       <maximumStackSize value="2" />
       <properties />
     </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/plugin_post_build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="2" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/write_version_to_plugin_xml.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="2" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/plugin_pre_build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <maximumStackSize value="2" />
-      <properties />
-    </buildFile>
   </component>
 </project>
 
diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
new file mode 100644
index 00000000000..6f48302f892
--- /dev/null
+++ b/TeamCityBuild.xml
@@ -0,0 +1,69 @@
+<project name="Jet CI Steps" default="none">
+    <import file="build.xml" optional="false"/>
+
+    <property name="build.number" value="snapshot"/>
+    <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
+    <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
+    <property name="plugin.xml.bk" value="${plugin.xml}.bk"/>
+
+    <macrodef name="echoprop">
+        <attribute name="prop"/>
+        <sequential>
+            <echo>@{prop}=${@{prop}}</echo>
+        </sequential>
+    </macrodef>
+
+    <echoprop prop="os.name"/>
+    <echoprop prop="os.version"/>
+    <echoprop prop="os.arch"/>
+    <echoprop prop="java.home"/>
+    <echoprop prop="java.vendor"/>
+    <echoprop prop="java.version"/>
+    <echoprop prop="user.name"/>
+    <echoprop prop="user.home"/>
+    <echoprop prop="user.dir"/>
+
+    <target name="unzipDependencies">
+        <unzip dest="ideaSDK">
+            <fileset dir="ideaSDK" includes="ideaIC*.zip"/>
+        </unzip>
+
+        <delete dir="ideaSDK" includes="ideaIC*.zip"/>
+    </target>
+
+    <target name="cleanupArtifacts">
+        <delete dir="${artifact.output.path}" includes="*"/>
+    </target>
+
+    <target name="writeVersionToPluginXml">
+        <copy file="${plugin.xml}" tofile="${plugin.xml.bk}"/>
+        <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true">
+            <filterchain>
+                <replacetokens>
+                    <token key="snapshot" value="${build.number}"/>
+                </replacetokens>
+            </filterchain>
+        </copy>
+    </target>
+
+    <target name="cleanupPluginXml">
+        <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
+        <delete file="${plugin.xml.bk}" quiet="true"/>
+    </target>
+
+    <target name="pre_build" depends="cleanupArtifacts, unzipDependencies, dist, writeVersionToPluginXml">
+    </target>
+
+    <target name="zipArtifact">
+        <zip destfile="${artifact.output.path}/kotlin-plugin-${build.number}">
+            <fileset dir="${artifact.output.path}/Kotlin"/>
+        </zip>
+        <delete dir="${artifact.output.path}/Kotlin" quiet="true"/>
+    </target>
+
+    <target name="post_build" depends="cleanupPluginXml, zipArtifact"/>
+
+    <target name="none">
+        <fail message="Either specify pre_build or post_build"/>
+    </target>
+</project>
diff --git a/bootstrap.xml b/bootstrap.xml
deleted file mode 100644
index 6f8489a54a2..00000000000
--- a/bootstrap.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<project name="Jet CI Bootstrap" default="CEBuild">
-    <import file="build.xml" optional="false"/>
-
-    <macrodef name="echoprop">
-        <attribute name="prop"/>
-        <sequential>
-            <echo>@{prop}=${@{prop}}</echo>
-        </sequential>
-    </macrodef>
-
-    <echoprop prop="os.name"/>
-    <echoprop prop="os.version"/>
-    <echoprop prop="os.arch"/>
-    <echoprop prop="java.home"/>
-    <echoprop prop="java.vendor"/>
-    <echoprop prop="java.version"/>
-    <echoprop prop="user.name"/>
-    <echoprop prop="user.home"/>
-    <echoprop prop="user.dir"/>
-
-    <target name="unzipDependencies">
-        <unzip dest="ideaSDK">
-            <fileset dir="ideaSDK" includes="ideaIC*.zip"/>
-        </unzip>
-
-        <delete dir="ideaSDK" includes="ideaIC*.zip"/>
-    </target>
-
-    <target name="CEBuild" depends="unzipDependencies, dist">
-
-    </target>
-
-</project>
diff --git a/plugin_post_build.xml b/plugin_post_build.xml
deleted file mode 100644
index 24645e5a5ca..00000000000
--- a/plugin_post_build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<project name="Kotlin Plugin Post-build Step">
-
-    <property name="artifact.output.path" value="${basedir}/out/artifacts"/>
-    <property name="build.number" value="snapshot"/>
-
-    <target name="renamePluginZip">
-        <!-- Rename the zip to kotlin-plugin-${build}.zip-->
-        <move file="${artifact.output.path}/KotlinPlugin.zip" tofile="${artifact.output.path}/kotlin-plugin-${build.number}.zip">
-        </move>
-    </target>
-</project>
diff --git a/plugin_pre_build.xml b/plugin_pre_build.xml
deleted file mode 100644
index de52fada24d..00000000000
--- a/plugin_pre_build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<project name="Kotlin Plugin Pre-build Step">
-
-    <property name="artifact.output.path" value="${basedir}/out/artifacts/KotlinPlugin"/>
-
-    <target name="cleanup">
-        <delete verbose="true" quiet="true">
-            <fileset dir="${artifact.output.path}" includes="*"/>
-        </delete>
-    </target>
-</project>
diff --git a/write_version_to_plugin_xml.xml b/write_version_to_plugin_xml.xml
deleted file mode 100644
index 1b7a10d2336..00000000000
--- a/write_version_to_plugin_xml.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<project name="Write Plugin Version to plugin.xml">
-
-    <property name="build.number" value="snapshot"/>
-    <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
-    <property name="plugin.xml.bk" value="${plugin.xml}.bk"/>
-
-    <target name="writeVersionToPluginXml">
-        <copy file="${plugin.xml}" tofile="${plugin.xml.bk}"/>
-        <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true">
-            <filterchain>
-                <replacetokens>
-                    <token key="snapshot" value="${build.number}"/>
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="cleanup">
-        <copy file="${plugin.xml.bk}" tofile="${plugin.xml}" overwrite="true"/>
-        <delete file="${plugin.xml.bk}" quiet="true"/>
-    </target>
-</project>