diff --git a/project/Build.xml b/project/Build.xml
deleted file mode 100644
index fbfb33b90..000000000
--- a/project/Build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<xml>
-
-<include name="${HXCPP}/build-tool/BuildCommon.xml"/>
-
-<set name="dynamic_link" value="1" unless="static_link" />
-
-<import name="libs/std/Build.xml" />
-<import name="libs/zlib/Build.xml" />
-<import name="libs/regexp/Build.xml" />
-<import name="libs/mysql/Build.xml" />
-<import name="libs/sqlite/Build.xml" />
-
-
-
-
-<files id="msvccompat" >
-  <file name="StlLink.cpp"/>
-</files>
-
-<target id="msvccompat" output="${HX_TARGET_PREFIX}msvccompat${LIB_DBG}-${MSVC_VER}" tool="linker" toolid="${STD_MODULE_LINK}">
-  <files id="msvccompat"/>
-  <builddir name="libs/msvccompat"/>
-  <outdir name="${this_dir}/../${DESTDIR}/${BINDIR}"/>
-</target>
-
-
-<files id="linuxcompat" >
-  <file name="FdeltChk.c"/>
-</files>
-
-
-<target id="linuxcompat" output="${HX_TARGET_PREFIX}linuxcompat${HX_TARGET_SUFFIX}" tool="linker" toolid="${STD_MODULE_LINK}">
-  <files id="linuxcompat"/>
-  <builddir name="libs/linuxcompat"/>
-  <outdir name="${this_dir}/../${DESTDIR}/${BINDIR}"/>
-</target>
-
-
-
-<files id="nekoapi" >
-  <depend name="libs/nekoapi/neko.h"/>
-  <depend name="${HXCPP}/include/hx/Macros.h"/>
-  <depend name="${HXCPP}/include/hx/CFFI.h"/>
-  <file name="NekoAPI.cpp"/>
-  <compilerflag value="-Dneko_v1" if="neko_v1" />
-</files>
-
-
-
-<set name="neko_v2" value="1" unless="neko_v1" />
-
-<set name="NEKO_LIB_DIR" value="bin/${BINDIR}" />
-
-<target id="nekoapi" output="nekoapi" tool="linker" toolid="dll">
-  <ext value=".ndll"/>
-  <files id="nekoapi"/>
-  <builddir name="libs/nekoapi"/>
-  <lib name="${NEKO_LIB_DIR}/neko.lib" if="windows" />
-  <lib name="-L${NEKO_LIB_DIR}" unless="windows"/>
-  <lib name="-lneko" unless="windows"/>
-  <outdir name="${this_dir}/../bin/${BINDIR}"/>
-</target>
-
-
-<target id="default" if="linuxcompat" >
-    <target id="linuxcompat"  />
-</target>
-
-<target id="default" unless="linuxcompat" >
-   <target id="std"/>
-   <target id="regexp"/>
-   <target id="zlib"/>
-   <target id="mysql"/>
-   <target id="sqlite" unless="winrt"/><!-- TODO -->
-   <section if="static_link">
-      <target id="msvccompat" if="windows" unless="mingw||MSVC19" />
-      <target id="linuxcompat" if="linux" />
-      <target id="linuxcompat" if="gcw0" />
-   </section>
-</target>
-
-
-</xml>
diff --git a/run.n b/run.n
old mode 100755
new mode 100644
index 2153e3e71..3300b6dd1
Binary files a/run.n and b/run.n differ
diff --git a/tools/build/Build.hx b/tools/build/Build.hx
deleted file mode 100644
index 965fa4ae3..000000000
--- a/tools/build/Build.hx
+++ /dev/null
@@ -1,39 +0,0 @@
-class Build extends hxcpp.Builder
-{
-   // Create a build in 'bin' directory, with the "stdlibc++" flags for compatibility
-   //  This flasg should not make a difference because hxcpp does not use stdlibc++
-   override public function wantLegacyIosBuild() { return true; }
-
-   override public function wantWindows64() { return true; }
-
-
-   // Override to ensure this version if hxcpp is used, even if haxelib says otherwise
-   override public function runBuild(target:String, isStatic:Bool, arch:String, inFlags:Array<String>)
-   {
-       var args = ["run.n", "Build.xml"].concat(inFlags);
-       var here = Sys.getCwd().split("\\").join("/");
-
-       var parts = here.split("/");
-       if (parts.length>0 && parts[parts.length-1]=="")
-          parts.pop();
-       if (parts.length>0)
-          parts.pop();
-       var hxcppDir = parts.join("/");
-
-       // This is how haxelib calls a 'run.n' script...
-       Sys.setCwd(hxcppDir);
-       args.push(here);
-       Sys.println("neko " + args.join(" ")); 
-       if (Sys.command("neko",args)!=0)
-       {
-          Sys.println("#### Error building neko " + inFlags.join(" "));
-          Sys.exit(-1);
-       }
-       Sys.setCwd(here);
-   }
-
-   public static function main()
-   {
-      new Build( Sys.args() );
-   }
-}
diff --git a/tools/build/compile.hxml b/tools/build/compile.hxml
deleted file mode 100644
index 11b8b732f..000000000
--- a/tools/build/compile.hxml
+++ /dev/null
@@ -1,5 +0,0 @@
--neko ../../project/build.n
--main Build
--D neko_v1
--lib hxcpp
--debug
diff --git a/tools/run/RunMain.hx b/tools/run/RunMain.hx
index f5a4bb301..eccc1e6f7 100644
--- a/tools/run/RunMain.hx
+++ b/tools/run/RunMain.hx
@@ -21,14 +21,9 @@ class RunMain
       }
 
       log('This version of hxcpp ($dir) appears to be a source/developement version.');
-      log("Before this can be used, you need to:");
-      log(" 1. Rebuild the main command-line tool, this can be done with:");
-      log("     cd tools/hxcpp");
-      log("     haxe compile.hxml");
-      log(" 2. FOR HXCPP API < 330:");
-      log("    Build the binaries appropriate to your system(s), this can be done with:");
-      log("     cd project");
-      log("     neko build.n");
+      log("Before this can be used, you need to rebuild the main command-line tool:");
+      log("  cd tools/hxcpp");
+      log("  haxe compile.hxml");
 
       var gotUserResponse = false;
       sys.thread.Thread.create(function() {