diff --git a/.idea/ant.xml b/.idea/ant.xml
index 3b6d7de4572..278da6d04ad 100644
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/TeamCityBuild.xml">
-      <maximumHeapSize value="512" />
-    </buildFile>
     <buildFile url="file://$PROJECT_DIR$/idea-runner/runner.xml" />
     <buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
       <maximumHeapSize value="1024" />
diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
deleted file mode 100644
index eb9ba42dd99..00000000000
--- a/TeamCityBuild.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<project name="Kotlin CI Steps" default="none">
-    <import file="common.xml" optional="false"/>
-    <property name="kotlin-home" value="${output}/kotlinc"/>
-
-    <property name="build.number" value="snapshot"/>
-    <property name="fail.on.plugin.verifier.error" value="true"/>
-
-    <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
-
-    <property name="artifact.output.path" value="${basedir}/dist/artifacts/ideaPlugin"/>
-    <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
-    <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
-    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
-    <property name="plugin.xml.version.number" value="${build.number}"/>
-
-    <property name="compiler.version.java" value="core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java"/>
-    <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinCompilerVersion.java.bk"/>
-    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
-    <property name="compiler.version.number" value="${build.number}"/>
-    <property name="compiler.ant.fork.jvmargs" value="-Xmx1024m"/>
-
-    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
-    <property name="pluginArtifactDir" value="Kotlin" />
-
-    <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"/>
-
-    <macrodef name="run-gradle">
-        <attribute name="tasks" />
-        <attribute name="args" default="" />
-        <sequential>
-            <java classname="org.gradle.wrapper.GradleWrapperMain"
-                  fork="true"
-                  dir="${basedir}"
-                  failonerror="true"
-                  timeout="4000000"
-                  maxmemory="400m"
-                  taskname="gradle">
-                <classpath>
-                    <pathelement location="${basedir}/gradle/wrapper/gradle-wrapper.jar"/>
-                </classpath>
-                <arg line="--no-daemon" />
-                <arg line="@{tasks}" />
-                <arg line="@{args}" />
-            </java>
-        </sequential>
-    </macrodef>
-
-    <target name="cleanupArtifacts">
-        <run-gradle tasks="cleanupArtifacts" />
-    </target>
-
-    <target name="zip-compiler">
-        <run-gradle tasks="zipCompiler" args="-PdeployVersion=${build.number}" />
-    </target>
-
-    <target name="zip-test-data">
-        <run-gradle tasks="zipTestData" />
-    </target>
-
-    <target name="writeCompilerVersionToTemplateFile">
-        <!-- empty, version is written in gradle build -->
-    </target>
-
-    <target name="writePluginVersionToTemplateFile">
-        <run-gradle tasks="writePluginVersion" args="-PpluginVersion=${plugin.xml.version.number}" />
-    </target>
-
-    <target name="zipArtifacts">
-        <run-gradle tasks="zipPlugin" args="-PpluginArtifactDir=${pluginArtifactDir} -PpluginZipPath=${plugin.zip}"/>
-    </target>
-
-    <macrodef name="print-statistic">
-        <attribute name="key"/>
-        <attribute name="value"/>
-
-        <sequential>
-            <echo message="##teamcity[buildStatisticValue key='@{key}' value='@{value}']"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="print-file-size-statistic">
-        <attribute name="path"/>
-        <attribute name="file-name"/>
-
-        <sequential>
-            <local name="file.size"/>
-            <length file="@{path}/@{file-name}" property="file.size"/>
-            <print-statistic key="@{file-name} size" value="${file.size}"/>
-        </sequential>
-    </macrodef>
-
-    <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
-
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib-js.jar"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin-test.js"/>
-        <print-file-size-statistic path="${basedir}/libraries/stdlib/js/build/classes/main" file-name="kotlin.meta.js"/>
-    </target>
-
-    <target name="none">
-        <fail message="Either specify pre_build or post_build"/>
-    </target>
-
-</project>
diff --git a/TeamCityBuild.xml.as31 b/TeamCityBuild.xml.as31
deleted file mode 100644
index 52adddc64bb..00000000000
--- a/TeamCityBuild.xml.as31
+++ /dev/null
@@ -1,144 +0,0 @@
-<project name="Kotlin CI Steps" default="none">
-    <import file="common.xml" optional="false"/>
-    <property name="kotlin-home" value="${output}/kotlinc"/>
-
-    <property name="build.number" value="snapshot"/>
-    <property name="fail.on.plugin.verifier.error" value="true"/>
-
-    <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
-
-    <property name="artifact.output.path" value="${basedir}/dist/artifacts/ideaPlugin"/>
-    <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
-    <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
-    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
-    <property name="plugin.xml.version.number" value="${build.number}"/>
-
-    <property name="compiler.version.java" value="core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java"/>
-    <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinCompilerVersion.java.bk"/>
-    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
-    <property name="compiler.version.number" value="${build.number}"/>
-    <property name="compiler.ant.fork.jvmargs" value="-Xmx1024m"/>
-
-    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
-    <property name="pluginArtifactDir" value="Kotlin" />
-
-    <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"/>
-
-    <macrodef name="run-gradle">
-        <attribute name="tasks" />
-        <attribute name="args" default="" />
-        <sequential>
-            <java classname="org.gradle.wrapper.GradleWrapperMain"
-                  fork="true"
-                  dir="${basedir}"
-                  failonerror="true"
-                  timeout="4000000"
-                  maxmemory="400m"
-                  taskname="gradle">
-                <classpath>
-                    <pathelement location="${basedir}/gradle/wrapper/gradle-wrapper.jar"/>
-                </classpath>
-                <arg line="--no-daemon" />
-                <arg line="@{tasks}" />
-                <arg line="@{args}" />
-            </java>
-        </sequential>
-    </macrodef>
-
-    <target name="cleanupArtifacts">
-        <run-gradle tasks="cleanupArtifacts" />
-    </target>
-
-    <target name="zip-compiler">
-        <run-gradle tasks="zipCompiler" args="-PdeployVersion=${build.number}" />
-    </target>
-
-    <target name="zip-test-data">
-        <run-gradle tasks="zipTestData" />
-    </target>
-
-    <target name="writeCompilerVersionToTemplateFile">
-        <!-- empty, version is written in gradle build -->
-    </target>
-
-    <target name="writePluginVersionToTemplateFile">
-        <run-gradle tasks="writePluginVersion" args="-PpluginVersion=${plugin.xml.version.number}" />
-    </target>
-
-    <target name="zipArtifacts">
-        <run-gradle tasks="zipPlugin" args="-PpluginArtifactDir=${pluginArtifactDir} -PpluginZipPath=${plugin.zip}"/>
-    </target>
-
-    <macrodef name="print-statistic">
-        <attribute name="key"/>
-        <attribute name="value"/>
-
-        <sequential>
-            <echo message="##teamcity[buildStatisticValue key='@{key}' value='@{value}']"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="print-file-size-statistic">
-        <attribute name="path"/>
-        <attribute name="file-name"/>
-
-        <sequential>
-            <local name="file.size"/>
-            <length file="@{path}/@{file-name}" property="file.size"/>
-            <print-statistic key="@{file-name} size" value="${file.size}"/>
-        </sequential>
-    </macrodef>
-
-    <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
-
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib-js.jar"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin-test.js"/>
-        <print-file-size-statistic path="${basedir}/libraries/stdlib/js/build/classes/main" file-name="kotlin.meta.js"/>
-    </target>
-
-    <target name="none">
-        <fail message="Either specify pre_build or post_build"/>
-    </target>
-
-    <macrodef name="patch_plugin_xml">
-        <attribute name="plugin.xml" />
-        <sequential>
-            <replace file="@{plugin.xml}" token="&lt;!-- DEPENDS-ON-AS-PLACEHOLDER --&gt;" value="&lt;depends&gt;com.intellij.modules.androidstudio&lt;/depends&gt;"/>
-        </sequential>
-    </macrodef>
-
-    <target name="patchXmlForAndroidStudio">
-        <unzip src="${artifact.output.path}/Kotlin/lib/kotlin-plugin.jar" dest="tmpAndroidStudio">
-            <patternset>
-                <include name="META-INF/plugin.xml"/>
-            </patternset>
-        </unzip>
-
-        <patch_plugin_xml plugin.xml="tmpAndroidStudio/META-INF/plugin.xml"/>
-
-        <jar destfile="${artifact.output.path}/Kotlin/lib/kotlin-plugin.jar" update="true">
-            <fileset dir="tmpAndroidStudio"/>
-            <file file="META-INF/plugin.xml"/>
-        </jar>
-
-        <delete file="tmpAndroidStudio"/>
-    </target>
-</project>
diff --git a/TeamCityBuild.xml.as32 b/TeamCityBuild.xml.as32
deleted file mode 100644
index 52adddc64bb..00000000000
--- a/TeamCityBuild.xml.as32
+++ /dev/null
@@ -1,144 +0,0 @@
-<project name="Kotlin CI Steps" default="none">
-    <import file="common.xml" optional="false"/>
-    <property name="kotlin-home" value="${output}/kotlinc"/>
-
-    <property name="build.number" value="snapshot"/>
-    <property name="fail.on.plugin.verifier.error" value="true"/>
-
-    <property name="version_substitute_dir" value="${basedir}/versions_temp/"/>
-
-    <property name="artifact.output.path" value="${basedir}/dist/artifacts/ideaPlugin"/>
-    <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
-    <property name="plugin.xml.bk" value="${version_substitute_dir}/plugin.xml.bk"/>
-    <property name="plugin.xml.versioned" value="${plugin.xml}.versioned"/>
-    <property name="plugin.xml.version.number" value="${build.number}"/>
-
-    <property name="compiler.version.java" value="core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java"/>
-    <property name="compiler.version.java.bk" value="${version_substitute_dir}/KotlinCompilerVersion.java.bk"/>
-    <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned"/>
-    <property name="compiler.version.number" value="${build.number}"/>
-    <property name="compiler.ant.fork.jvmargs" value="-Xmx1024m"/>
-
-    <property name="plugin.zip" value="${artifact.output.path}/kotlin-plugin-${build.number}.zip"/>
-    <property name="pluginArtifactDir" value="Kotlin" />
-
-    <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"/>
-
-    <macrodef name="run-gradle">
-        <attribute name="tasks" />
-        <attribute name="args" default="" />
-        <sequential>
-            <java classname="org.gradle.wrapper.GradleWrapperMain"
-                  fork="true"
-                  dir="${basedir}"
-                  failonerror="true"
-                  timeout="4000000"
-                  maxmemory="400m"
-                  taskname="gradle">
-                <classpath>
-                    <pathelement location="${basedir}/gradle/wrapper/gradle-wrapper.jar"/>
-                </classpath>
-                <arg line="--no-daemon" />
-                <arg line="@{tasks}" />
-                <arg line="@{args}" />
-            </java>
-        </sequential>
-    </macrodef>
-
-    <target name="cleanupArtifacts">
-        <run-gradle tasks="cleanupArtifacts" />
-    </target>
-
-    <target name="zip-compiler">
-        <run-gradle tasks="zipCompiler" args="-PdeployVersion=${build.number}" />
-    </target>
-
-    <target name="zip-test-data">
-        <run-gradle tasks="zipTestData" />
-    </target>
-
-    <target name="writeCompilerVersionToTemplateFile">
-        <!-- empty, version is written in gradle build -->
-    </target>
-
-    <target name="writePluginVersionToTemplateFile">
-        <run-gradle tasks="writePluginVersion" args="-PpluginVersion=${plugin.xml.version.number}" />
-    </target>
-
-    <target name="zipArtifacts">
-        <run-gradle tasks="zipPlugin" args="-PpluginArtifactDir=${pluginArtifactDir} -PpluginZipPath=${plugin.zip}"/>
-    </target>
-
-    <macrodef name="print-statistic">
-        <attribute name="key"/>
-        <attribute name="value"/>
-
-        <sequential>
-            <echo message="##teamcity[buildStatisticValue key='@{key}' value='@{value}']"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="print-file-size-statistic">
-        <attribute name="path"/>
-        <attribute name="file-name"/>
-
-        <sequential>
-            <local name="file.size"/>
-            <length file="@{path}/@{file-name}" property="file.size"/>
-            <print-statistic key="@{file-name} size" value="${file.size}"/>
-        </sequential>
-    </macrodef>
-
-    <target name="printStatistics">
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib.jar"/>
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-reflect.jar"/>
-
-        <print-file-size-statistic path="${kotlin-home}/lib" file-name="kotlin-stdlib-js.jar"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin.js"/>
-        <print-file-size-statistic path="${js.stdlib.output.dir}" file-name="kotlin-test.js"/>
-        <print-file-size-statistic path="${basedir}/libraries/stdlib/js/build/classes/main" file-name="kotlin.meta.js"/>
-    </target>
-
-    <target name="none">
-        <fail message="Either specify pre_build or post_build"/>
-    </target>
-
-    <macrodef name="patch_plugin_xml">
-        <attribute name="plugin.xml" />
-        <sequential>
-            <replace file="@{plugin.xml}" token="&lt;!-- DEPENDS-ON-AS-PLACEHOLDER --&gt;" value="&lt;depends&gt;com.intellij.modules.androidstudio&lt;/depends&gt;"/>
-        </sequential>
-    </macrodef>
-
-    <target name="patchXmlForAndroidStudio">
-        <unzip src="${artifact.output.path}/Kotlin/lib/kotlin-plugin.jar" dest="tmpAndroidStudio">
-            <patternset>
-                <include name="META-INF/plugin.xml"/>
-            </patternset>
-        </unzip>
-
-        <patch_plugin_xml plugin.xml="tmpAndroidStudio/META-INF/plugin.xml"/>
-
-        <jar destfile="${artifact.output.path}/Kotlin/lib/kotlin-plugin.jar" update="true">
-            <fileset dir="tmpAndroidStudio"/>
-            <file file="META-INF/plugin.xml"/>
-        </jar>
-
-        <delete file="tmpAndroidStudio"/>
-    </target>
-</project>
diff --git a/build.gradle.kts b/build.gradle.kts
index fb9a9ae6ddc..ace6fc8e5c4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -389,7 +389,6 @@ tasks {
         }
     }
 
-    // TODO: copied from TeamCityBuild.xml (with ultimate-related modification), consider removing after migrating from it
     "cleanupArtifacts" {
         doLast {
             delete(ideaPluginDir)