diff --git a/build.xml b/build.xml
index 293477ddae7..77ba4c6378a 100644
--- a/build.xml
+++ b/build.xml
@@ -61,145 +61,6 @@
         </java>
     </target>
 
-    <!--
-    <target name="compileKunit" depends="jarRT">
-        <mkdir dir="${output}/classes/kunit"/>
-        <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true" fork="true">
-            <classpath>
-              <path refid="classpath"/>
-              <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
-            </classpath>
-            <arg value="-stdlib"/>
-            <arg value="${kotlin-home}/lib/kotlin-runtime.jar"/>
-            <arg value="-src"/>
-            <arg value="${basedir}/kunit/src/main/kotlin"/>
-            <arg value="-output"/>
-            <arg value="${output}/classes/kunit"/>
-            <arg value="-module"/>
-            <arg value="${basedir}/kunit/module.kt"/>
-        </java>
-        <jar destfile="${kotlin-home}/lib/kotlin-test.jar">
-            <fileset dir="${output}/classes/kunit"/>
-        </jar>
-    </target>
-
-    <target name="compileKdoc">
-        <mkdir dir="${output}/classes/kdoc"/>
-        <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true" fork="true">
-            <classpath>
-              <path refid="classpath"/>
-              <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
-            </classpath>
-            <arg value="-stdlib"/>
-            <arg value="${kotlin-home}/lib/kotlin-runtime.jar"/>
-            <arg value="-src"/>
-            <arg value="${basedir}/kdoc/src/main/kotlin"/>
-            <arg value="-output"/>
-            <arg value="${output}/classes/kdoc"/>
-            <arg value="-module"/>
-            <arg value="${basedir}/kdoc/module.kt"/>
-        </java>
-        <jar destfile="${kotlin-home}/lib/kotlin-doc.jar">
-            <fileset dir="${output}/classes/kdoc"/>
-        </jar>
-    </target>
-    -->
-
-<!--
-    <target name="docStdlib" depends="compileKdoc">
-        <mkdir dir="${output}/classes/stdlib"/>
-        <mkdir dir="${output}/apidoc/stdlib"/>
-        <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true" fork="true">
-            <classpath>
-                <path refid="classpath"/>
-                <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
-                <pathelement location="${output}/classes/kdoc"/>
-                <!- - TODO Dirty Hack until kdoc jar has stdlib inside it -->
-<!--
-                <pathelement location="${output}/classes/stdlib"/>
-            </classpath>
-            <arg value="-output"/>
-            <arg value="${output}/classes/apidoc"/>
-            <arg value="-docOutput"/>
-            <arg value="${output}/apidoc/stdlib"/>
-            <arg value="-module"/>
-            <arg value="${basedir}/kdoc/ApiDocsModule.kt"/>
-        </java>
-
-        <fail message="No stdlib API docs generated.">
-            <condition>
-                <not>
-                    <resourcecount count="1">
-                        <fileset id="fs" dir="${output}/apidoc/stdlib" includes="index.html"/>
-                    </resourcecount>
-                </not>
-            </condition>
-        </fail>
-    </target>
-
-    <target name="compileTestlib" depends="compileKunit">
-        <mkdir dir="${output}/classes/testlib"/>
-        <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true" fork="true">
-            <classpath>
-              <path refid="classpath"/>
-              <pathelement location="${kotlin-home}/lib/kotlin-compiler.jar"/>
-            </classpath>
-            <arg value="-stdlib"/>
-            <arg value="${kotlin-home}/lib/kotlin-runtime.jar"/>
-            <arg value="-src"/>
-            <arg value="${basedir}/testlib/test"/>
-            <arg value="-output"/>
-            <arg value="${output}/classes/testlib"/>
-            <arg value="-module"/>
-            <arg value="${basedir}/testlib/module.kt"/>
-        </java>
-    </target>
-
-    <target name="generateStdlib" depends="compileTestlib" description="Generates the stdlib APIs for arrays and kotlin collections">
-        <java classname="org.jetbrains.kotlin.tools.namespace" failonerror="true" fork="true">
-            <classpath>
-                <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
-                <pathelement location="${kotlin-home}/lib/kotlin-test.jar"/>
-                <pathelement location="/libraries/testlib/lib/junit-4.9.jar"/>
-                <fileset dir="/libraries/testlib/lib">
-                  <include name="**/*.jar"/>
-                </fileset>
-              <pathelement path="${output}/classes/testlib"/>
-            </classpath>
-        </java>
-    </target>
-
-    <target name="testlib" depends="compileTestlib">
-        <mkdir dir="${output}/test-reports"/>
-
-        <junit printsummary="yes" haltonfailure="true">
-          <classpath>
-              <pathelement location="${kotlin-home}/lib/kotlin-runtime.jar"/>
-              <pathelement location="${kotlin-home}/lib/kotlin-test.jar"/>
-              <pathelement location="/libraries/testlib/lib/junit-4.9.jar"/>
-              <fileset dir="/libraries/testlib/lib">
-                <include name="**/*.jar"/>
-              </fileset>
-            <pathelement path="${output}/classes/testlib"/>
-          </classpath>
-
-          <formatter type="plain"/>
-
-<!- -
-          <test name="my.test.TestCase" haltonfailure="no" outfile="result">
-            <formatter type="xml"/>
-          </test>
--->
-<!--
-          <batchtest fork="yes" todir="${output}/test-reports" haltonerror="true">
-            <fileset dir="${output}/classes/testlib">
-              <include name="**/*Test.*"/>
-            </fileset>
-          </batchtest>
-        </junit>
-    </target>
-    !-->
-
     <target name="compileJDKHeaders" depends="jar">
         <mkdir dir="${output}/classes/stdlib"/>
         <java classname="org.jetbrains.jet.cli.KotlinCompiler" failonerror="true">
@@ -284,10 +145,6 @@
 
     <target name="doc" depends="dist"/>
 
-<!--
-    <target name="test" depends="dist" description="Creates the distribution and runs all the tests"/>
--->
-
     <target name="zip" depends="dist">
         <echo file="${kotlin-home}/build.txt" message="${build.number}"/>
         <zip destfile="${output}/${output.name}.zip">
diff --git a/lib/parboiled-core-1.0.2.jar b/lib/parboiled-core-1.0.2.jar
deleted file mode 100644
index df057a15de8..00000000000
Binary files a/lib/parboiled-core-1.0.2.jar and /dev/null differ
diff --git a/lib/parboiled-java-1.0.2.jar b/lib/parboiled-java-1.0.2.jar
deleted file mode 100644
index da8ec8721c6..00000000000
Binary files a/lib/parboiled-java-1.0.2.jar and /dev/null differ
diff --git a/lib/pegdown-1.1.0.jar b/lib/pegdown-1.1.0.jar
deleted file mode 100644
index 0741aecfd94..00000000000
Binary files a/lib/pegdown-1.1.0.jar and /dev/null differ