diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0170f46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.vscode/
+/out/
+/buildtools/
+*.pyc
+*.code-workspace
+.tmp-*
diff --git a/README.md b/README.md
index 691d6d3..da4b112 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 # Setup
 1. Install required dependencies for building: `sudo apt-get install curl unzip python python2`.
 2. Change directory to the root of the repo: `cd fuchsia-benchmarks` and run the setup script `./scripts/download-build-tools.sh`
-3. Generate ninja files: ./buildtools/linux64/gn gen out/core.astro-release --args='target_os="fuchsia" target_cpu="arm64"'
-4. Build: ./buildtools/linux64/ninja -C out/core.astro-release
-5. Start the package server: ./third_party/fuchsia-sdk/bin/fserve.sh
+3. Generate ninja files: `./buildtools/linux64/gn gen out/core.astro-release --args='target_os="fuchsia" target_cpu="arm64"'`
+4. Build: `./buildtools/linux64/ninja -C out/core.astro-release`
+5. Start the package server: `./third_party/fuchsia-sdk/bin/fserve.sh`
 
 # Dhrystone Benchmark
 See https://en.wikipedia.org/wiki/Dhrystone.
 
 ## How to Run
 1. Follow previous steps from the Setup section
-2. Publish the Dhrystone component: ./third_party/fuchsia-sdk/bin/fpublish.sh out/core.astro-release/gen/third_party/dhrystone/dhrystone/dhrystone.far
-3. Run the benchmark: ./third_party/fuchsia-sdk/bin/fssh.sh run fuchsia-pkg://fuchsia.com/dhrystone#meta/dhrystone.cmx 10
+2. Publish the Dhrystone component: `./third_party/fuchsia-sdk/bin/fpublish.sh out/core.astro-release/gen/third_party/dhrystone/dhrystone/dhrystone.far`
+3. Run the benchmark: `./third_party/fuchsia-sdk/bin/fssh.sh run fuchsia-pkg://fuchsia.com/dhrystone#meta/dhrystone.cmx 10`
 
 * This is not an officially supported Google product*
diff --git a/out/core.astro-release/.ninja_deps b/out/core.astro-release/.ninja_deps
deleted file mode 100644
index f3f0e01..0000000
--- a/out/core.astro-release/.ninja_deps
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/.ninja_log b/out/core.astro-release/.ninja_log
deleted file mode 100644
index 8b33ae0..0000000
--- a/out/core.astro-release/.ninja_log
+++ /dev/null
@@ -1,87 +0,0 @@
-# ninja log v5
-1	17	315475200000000000	lib/libc++.so.2	ee46729cd52af503
-1	17	315475200000000000	lib/libc++abi.so.1	f671c24d4f61fc66
-2	18	315475200000000000	lib/libunwind.so.1	d60c36afd6aa1cd3
-3	18	1587411117000000000	lib/ld.so.1	ac3cbec5c26be1cf
-4	19	1587411114000000000	lib/libfdio.so	9a287126e71be341
-18	23	1587411706802172839	obj/build/config/clang/clang-runtime-libs.stamp	aa752f47ea7054ce
-19	24	1587411706802172839	obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp	8d92d9795bd7e12b
-19	24	1587411706802172839	obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp	f00c166e57b559ea
-23	28	1587411706806172850	obj/build/config/clang/c++-runtime-deps.stamp	57357c7a6b6ec668
-24	31	1587411706810172860	obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a	88df563c2e735709
-31	34	1587411706814172870	obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp	b7b7a1937485a311
-3	46	1587411706822172892	obj/src/dhrystone/dhrystone_bin/dhry_2.o	f1efe85914f0d6b4
-6	75	1587411706850172964	obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o	37b4b8c6e0db8ac4
-4	75	1587411706850172964	obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o	d85b694abae78d65
-7	80	1587411706858172985	obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o	ac0ad8d41fbdaa43
-17	85	1587411706862172996	obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o	4f60121b9dbccd0a
-16	85	1587411706862172996	obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o	f9ec532500fdb85a
-5	95	1587411706870173016	obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o	68964a882cc12c8c
-6	99	1587411706874173027	obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o	4f185375928a1b25
-10	100	1587411706874173027	obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o	a3fc1fd6d856ebd6
-5	101	1587411706878173038	obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o	9d87064f18bb31a0
-13	104	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o	ef64efb780df93ce
-10	104	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o	3263643e9cdfb24f
-7	105	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o	dee30624722a0463
-8	105	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o	9f6b72acaa0a9036
-13	105	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o	8d53c9913d66a812
-12	105	1587411706882173047	obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o	4c36db13aa9328f9
-15	108	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o	d1ed20b7fe925018
-9	108	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o	fa3abc6d50a13908
-14	108	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o	434f872f6fc2c2e1
-11	109	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o	ef0a38da4aa5a9b8
-9	109	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o	38df95f2c912b01f
-11	111	1587411706886173058	obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o	746d6758c70fc12c
-15	111	1587411706890173068	obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o	3a846c44bc5d8b1f
-111	115	1587411706894173079	obj/third_party/fuchsia-sdk/pkg/zx/libzx.a	6ae6d8055a9c1190
-2	140	1587411706918173142	obj/src/dhrystone/dhrystone_bin/dhry_1.o	a54bed2d8e259c4e
-140	172	1587411706946173214	dhrystone_bin	cb2d05f02cd1f1ad
-172	176	1587411706954173235	obj/src/dhrystone/dhrystone_cmx.stamp	49bf52a5f622d724
-176	227	1587411707002173360	gen/src/dhrystone/dhrystone/dhrystone.archive_manifest	6939674628a2ebc7
-176	227	1587411707002173360	gen/src/dhrystone/dhrystone/ids.txt	6939674628a2ebc7
-176	227	1587411707002173360	gen/src/dhrystone/dhrystone/package	6939674628a2ebc7
-227	231	1587411707010173381	obj/src/dhrystone/dhrystone_package__archive-manifest.stamp	22a54a2ff570c77a
-231	281	1587411707054173495	gen/src/dhrystone/dhrystone/meta.far	683eaecb5f9b4482
-231	281	1587411707054173495	gen/src/dhrystone/dhrystone/package_manifest.json	683eaecb5f9b4482
-281	285	1587411707062173516	obj/src/dhrystone/dhrystone_package__archive-metadata.stamp	368104d9d2c1aa19
-285	328	1587411707102173621	gen/src/dhrystone/dhrystone/dhrystone.far	f44f520c0caf6bfd
-328	332	1587411707110173641	obj/src/dhrystone/dhrystone_package.stamp	460e0a3303cdb6f0
-332	336	1587411707114173651	obj/src/dhrystone/dhrystone.stamp	cd8bbdf554205453
-336	339	1587411707118173662	obj/default.stamp	779238219a0eff9c
-2	55	1587419777718045001	obj/src/dhrystone/dhrystone_bin/dhry_2.o	4eaac9e89c44ad4e
-7	73	1587419777734045039	obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o	75860eb82aa56b5b
-6	74	1587419777734045039	obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o	9bb56f97fdd7fff3
-7	74	1587419777738045048	obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o	5e1ee328cb5b56cc
-5	75	1587419777738045048	obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o	4e56d5134ce7555e
-6	80	1587419777742045057	obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o	6773d780e4a17678
-8	82	1587419777746045067	obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o	f99b9bee1ed6f7aa
-12	86	1587419777750045076	obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o	79bd6b42f44d5974
-3	94	1587419777758045095	obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o	f85d5126aa847494
-4	97	1587419777758045095	obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o	33340632bbec1608
-2	101	1587419777762045105	obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o	12cd309c926c54e0
-4	103	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o	b8a1eea217409f24
-3	103	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o	16eff5976b56a640
-5	103	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o	8f801c2e98a24aab
-10	104	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o	5fd9122a5cfa75cf
-5	104	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o	ff67a9ec24b08d09
-10	104	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o	9686dbb1ad1c045e
-13	105	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o	8e5f447854ca4249
-11	105	1587419777766045113	obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o	5980c56ee08eca29
-8	108	1587419777770045124	obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o	307c16e9502c469f
-11	108	1587419777770045124	obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o	7e26a4e36d377f47
-13	108	1587419777770045124	obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o	9f65e887e0343dee
-9	112	1587419777774045132	obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o	629632a052ef021
-112	116	1587419777782045152	obj/third_party/fuchsia-sdk/pkg/zx/libzx.a	6ae6d8055a9c1190
-1	150	1587419777814045227	obj/src/dhrystone/dhrystone_bin/dhry_1.o	6526941014f399e
-150	175	1587419777834045274	dhrystone_bin	d46fc42cea5891b3
-175	226	1587419777886045395	gen/src/dhrystone/dhrystone/dhrystone.archive_manifest	6939674628a2ebc7
-175	226	1587419777886045395	gen/src/dhrystone/dhrystone/ids.txt	6939674628a2ebc7
-175	226	1587419777886045395	gen/src/dhrystone/dhrystone/package	6939674628a2ebc7
-226	229	1587419777894045414	obj/src/dhrystone/dhrystone_package__archive-manifest.stamp	22a54a2ff570c77a
-230	271	1587419777930045500	gen/src/dhrystone/dhrystone/meta.far	683eaecb5f9b4482
-230	271	1587419777930045500	gen/src/dhrystone/dhrystone/package_manifest.json	683eaecb5f9b4482
-271	274	1587419777938045517	obj/src/dhrystone/dhrystone_package__archive-metadata.stamp	368104d9d2c1aa19
-274	318	1587419777978045612	gen/src/dhrystone/dhrystone/dhrystone.far	f44f520c0caf6bfd
-318	321	1587419777986045631	obj/src/dhrystone/dhrystone_package.stamp	460e0a3303cdb6f0
-321	324	1587419777990045640	obj/src/dhrystone/dhrystone.stamp	cd8bbdf554205453
-324	327	1587419777990045640	obj/default.stamp	779238219a0eff9c
diff --git a/out/core.astro-release/args.gn b/out/core.astro-release/args.gn
deleted file mode 100644
index 058cfc3..0000000
--- a/out/core.astro-release/args.gn
+++ /dev/null
@@ -1,2 +0,0 @@
-target_os = "fuchsia"
-target_cpu = "arm64"
diff --git a/out/core.astro-release/build.ninja b/out/core.astro-release/build.ninja
deleted file mode 100644
index a5a6bab..0000000
--- a/out/core.astro-release/build.ninja
+++ /dev/null
@@ -1,67 +0,0 @@
-ninja_required_version = 1.7.2
-
-rule gn
-  command = ../../buildtools/downloads/gn-linux-amd64-git_revision:239533d2d91a04b3317ca9101cf7189f4e651e4d/gn --root=../.. -q gen .
-  description = Regenerating ninja files
-
-build build.ninja: gn
-  generator = 1
-  depfile = build.ninja.d
-
-subninja toolchain.ninja
-
-build default: phony obj/default.stamp
-build c++-runtime-deps: phony obj/build/config/clang/c++-runtime-deps.stamp
-build clang-runtime-libs: phony obj/build/config/clang/clang-runtime-libs.stamp
-build dhrystone: phony obj/src/dhrystone/dhrystone.stamp
-build dhrystone_cmx: phony obj/src/dhrystone/dhrystone_cmx.stamp
-build dhrystone_package: phony obj/src/dhrystone/dhrystone_package.stamp
-build dhrystone_package__archive-manifest: phony obj/src/dhrystone/dhrystone_package__archive-manifest.stamp
-build dhrystone_package__archive-metadata: phony obj/src/dhrystone/dhrystone_package__archive-metadata.stamp
-build dhrystone_packaged_components_metadata: phony obj/src/dhrystone/dhrystone_packaged_components_metadata.stamp
-build fdio: phony obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
-build fdio_dist_libs: phony obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp
-build runtime_library_group: phony obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp
-build sysroot_dist_libs: phony obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp
-build zx: phony obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
-build $:default: phony obj/default.stamp
-build build/config/clang$:c++-runtime-deps: phony obj/build/config/clang/c++-runtime-deps.stamp
-build build/config/clang$:clang-runtime-libs: phony obj/build/config/clang/clang-runtime-libs.stamp
-build src/dhrystone$:dhrystone: phony obj/src/dhrystone/dhrystone.stamp
-build src/dhrystone: phony obj/src/dhrystone/dhrystone.stamp
-build src/dhrystone$:dhrystone_bin: phony ./dhrystone_bin
-build src/dhrystone$:dhrystone_cmx: phony obj/src/dhrystone/dhrystone_cmx.stamp
-build src/dhrystone$:dhrystone_package: phony obj/src/dhrystone/dhrystone_package.stamp
-build src/dhrystone$:dhrystone_package__archive-manifest: phony obj/src/dhrystone/dhrystone_package__archive-manifest.stamp
-build src/dhrystone$:dhrystone_package__archive-metadata: phony obj/src/dhrystone/dhrystone_package__archive-metadata.stamp
-build src/dhrystone$:dhrystone_packaged_components_metadata: phony obj/src/dhrystone/dhrystone_packaged_components_metadata.stamp
-build third_party/fuchsia-sdk/build/config$:runtime_library_group: phony obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp
-build third_party/fuchsia-sdk/build/config$:sysroot_dist_libs: phony obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp
-build third_party/fuchsia-sdk/pkg/fdio$:all: phony obj/third_party/fuchsia-sdk/pkg/fdio/all.stamp
-build third_party/fuchsia-sdk/pkg/fdio$:fdio: phony obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
-build third_party/fuchsia-sdk/pkg/fdio: phony obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
-build third_party/fuchsia-sdk/pkg/fdio$:fdio_dist_libs: phony obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp
-build third_party/fuchsia-sdk/pkg/zx$:all: phony obj/third_party/fuchsia-sdk/pkg/zx/all.stamp
-build third_party/fuchsia-sdk/pkg/zx$:zx: phony obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
-build third_party/fuchsia-sdk/pkg/zx: phony obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
-
-build all: phony $
-    obj/default.stamp $
-    obj/build/config/clang/c++-runtime-deps.stamp $
-    obj/build/config/clang/clang-runtime-libs.stamp $
-    obj/src/dhrystone/dhrystone.stamp $
-    ./dhrystone_bin $
-    obj/src/dhrystone/dhrystone_cmx.stamp $
-    obj/src/dhrystone/dhrystone_package.stamp $
-    obj/src/dhrystone/dhrystone_package__archive-manifest.stamp $
-    obj/src/dhrystone/dhrystone_package__archive-metadata.stamp $
-    obj/src/dhrystone/dhrystone_packaged_components_metadata.stamp $
-    obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp $
-    obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp $
-    obj/third_party/fuchsia-sdk/pkg/fdio/all.stamp $
-    obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a $
-    obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp $
-    obj/third_party/fuchsia-sdk/pkg/zx/all.stamp $
-    obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
-
-default default
diff --git a/out/core.astro-release/build.ninja.d b/out/core.astro-release/build.ninja.d
deleted file mode 100644
index 3633f6f..0000000
--- a/out/core.astro-release/build.ninja.d
+++ /dev/null
@@ -1 +0,0 @@
-build.ninja: ../../.gn ../../BUILD.gn ../../build/BUILD.gn ../../build/BUILDCONFIG.gn ../../build/config/BUILD.gn ../../build/config/clang/BUILD.gn ../../build/config/clang/clang.gni ../../build/config/compiler/BUILD.gn ../../build/toolchain/clang_toolchain.gni ../../build/toolchain/fuchsia/BUILD.gn ./args.gn ../../src/dhrystone/BUILD.gn ../../third_party/fuchsia-sdk/build/cmc.gni ../../third_party/fuchsia-sdk/build/component.gni ../../third_party/fuchsia-sdk/build/config/BUILD.gn ../../third_party/fuchsia-sdk/build/config/config.gni ../../third_party/fuchsia-sdk/build/fuchsia_sdk_pkg.gni ../../third_party/fuchsia-sdk/build/package.gni ../../third_party/fuchsia-sdk/build/pm_tool.gni ../../third_party/fuchsia-sdk/meta/manifest.json ../../third_party/fuchsia-sdk/pkg/fdio/BUILD.gn ../../third_party/fuchsia-sdk/pkg/zx/BUILD.gn
\ No newline at end of file
diff --git a/out/core.astro-release/dhrystone_bin b/out/core.astro-release/dhrystone_bin
deleted file mode 100755
index 6372bec..0000000
--- a/out/core.astro-release/dhrystone_bin
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.archive_manifest b/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.archive_manifest
deleted file mode 100644
index 9bbfc68..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.archive_manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-meta/package=gen/src/dhrystone/dhrystone/package
-lib/libfdio.so=lib/libfdio.so
-lib/libunwind.so.1=lib/libunwind.so.1
-lib/libc++.so.2=lib/libc++.so.2
-dhrystone_bin=dhrystone_bin
-lib/ld.so.1=lib/ld.so.1
-lib/libc++abi.so.1=lib/libc++abi.so.1
-meta/dhrystone.cmx=gen/src/dhrystone/dhrystone/dhrystone.cmx
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.cmx b/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.cmx
deleted file mode 100644
index 151ce0c..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.cmx
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "program": {
-        "binary" : "dhrystone_bin"
-    }
-
-}
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.far b/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.far
deleted file mode 100644
index 45178fc..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.far
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.runtime_deps b/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.runtime_deps
deleted file mode 100644
index 8832193..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone.runtime_deps
+++ /dev/null
@@ -1,6 +0,0 @@
-./dhrystone_bin
-lib/libc++.so.2
-lib/libc++abi.so.1
-lib/libunwind.so.1
-lib/ld.so.1
-lib/libfdio.so
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/ids.txt b/out/core.astro-release/gen/src/dhrystone/dhrystone/ids.txt
deleted file mode 100644
index 8ee6311..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/ids.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-ff6959a5ccf92c5b ../../../../lib/libfdio.so
-393e362e6a016296 ../../../../lib/libunwind.so.1
-ef9f9272b514463a ../../../../lib/libc++abi.so.1
-d12fb0ac271c9330 ../../../../dhrystone_bin
-fa39648a29eb2f06 ../../../../lib/ld.so.1
-a03ee9f443e83e8b ../../../../lib/libc++.so.2
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far b/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far
deleted file mode 100644
index f0a83a0..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.d b/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.d
deleted file mode 100644
index c9850b1..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.d
+++ /dev/null
@@ -1 +0,0 @@
-gen/src/dhrystone/dhrystone/meta.far: lib/libfdio.so lib/libunwind.so.1 lib/ld.so.1 lib/libc++abi.so.1 gen/src/dhrystone/dhrystone/dhrystone.cmx gen/src/dhrystone/dhrystone/package lib/libc++.so.2 dhrystone_bin gen/src/dhrystone/dhrystone/dhrystone.archive_manifest
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.merkle b/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.merkle
deleted file mode 100755
index 830cdae..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta.far.merkle
+++ /dev/null
@@ -1 +0,0 @@
-4d77989aa72b906a745fae10e2a82ad18f6ed88e51c78153ab8270ed9f866b2c
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta/contents b/out/core.astro-release/gen/src/dhrystone/dhrystone/meta/contents
deleted file mode 100755
index c17f061..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/meta/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-dhrystone_bin=a5ad491ae86ed86ab1fdadcc7af9ba2db0e1cb86c064ae4305c1d103312351bd
-lib/ld.so.1=452412abbe2649d773f3e62a373262cd802c4c6991e7e693f01d72d284aa84bb
-lib/libc++.so.2=2b154f638d98d9b899656da322a954c8ccbebe6c4950ac2ae8fdc853dd8a8a45
-lib/libc++abi.so.1=7cbbb4cfc47887848061dc83b250af42db252682e6d64a84ddd4974a8bc9412e
-lib/libfdio.so=e53c82434c34b3390478e8a7acebb483999046894a192fe8e72f977dc0f4eb24
-lib/libunwind.so.1=80eae8a517234fe02ff42de4d3cccfebfa234c752361caf31eacb442bb1af5c4
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/package b/out/core.astro-release/gen/src/dhrystone/dhrystone/package
deleted file mode 100644
index a365baf..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/package
+++ /dev/null
@@ -1 +0,0 @@
-{"version": "0", "name": "dhrystone"}
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone/package_manifest.json b/out/core.astro-release/gen/src/dhrystone/dhrystone/package_manifest.json
deleted file mode 100644
index 8083234..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone/package_manifest.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "version": "1",
-    "package": {
-        "name": "dhrystone",
-        "version": "0"
-    },
-    "blobs": [
-        {
-            "source_path": "gen/src/dhrystone/dhrystone/meta.far",
-            "path": "meta/",
-            "merkle": "4d77989aa72b906a745fae10e2a82ad18f6ed88e51c78153ab8270ed9f866b2c",
-            "size": 16384
-        },
-        {
-            "source_path": "dhrystone_bin",
-            "path": "dhrystone_bin",
-            "merkle": "a5ad491ae86ed86ab1fdadcc7af9ba2db0e1cb86c064ae4305c1d103312351bd",
-            "size": 201792
-        },
-        {
-            "source_path": "lib/ld.so.1",
-            "path": "lib/ld.so.1",
-            "merkle": "452412abbe2649d773f3e62a373262cd802c4c6991e7e693f01d72d284aa84bb",
-            "size": 660184
-        },
-        {
-            "source_path": "lib/libc++.so.2",
-            "path": "lib/libc++.so.2",
-            "merkle": "2b154f638d98d9b899656da322a954c8ccbebe6c4950ac2ae8fdc853dd8a8a45",
-            "size": 853560
-        },
-        {
-            "source_path": "lib/libc++abi.so.1",
-            "path": "lib/libc++abi.so.1",
-            "merkle": "7cbbb4cfc47887848061dc83b250af42db252682e6d64a84ddd4974a8bc9412e",
-            "size": 329176
-        },
-        {
-            "source_path": "lib/libfdio.so",
-            "path": "lib/libfdio.so",
-            "merkle": "e53c82434c34b3390478e8a7acebb483999046894a192fe8e72f977dc0f4eb24",
-            "size": 311984
-        },
-        {
-            "source_path": "lib/libunwind.so.1",
-            "path": "lib/libunwind.so.1",
-            "merkle": "80eae8a517234fe02ff42de4d3cccfebfa234c752361caf31eacb442bb1af5c4",
-            "size": 198024
-        }
-    ]
-}
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone_package_stamp.d b/out/core.astro-release/gen/src/dhrystone/dhrystone_package_stamp.d
deleted file mode 100644
index ec0b6f1..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone_package_stamp.d
+++ /dev/null
@@ -1 +0,0 @@
-gen/src/dhrystone/dhrystone/dhrystone.archive_manifest: lib/libfdio.so lib/libunwind.so.1 lib/libc++.so.2 dhrystone_bin lib/ld.so.1 lib/libc++abi.so.1
\ No newline at end of file
diff --git a/out/core.astro-release/gen/src/dhrystone/dhrystone_packaged_components_metadata.json b/out/core.astro-release/gen/src/dhrystone/dhrystone_packaged_components_metadata.json
deleted file mode 100644
index 7aeceac..0000000
--- a/out/core.astro-release/gen/src/dhrystone/dhrystone_packaged_components_metadata.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-  [
-    {
-      "source": "/usr/local/google/home/pshickel/src/fuchsia-benchmarks/src/dhrystone/:dhrystone_bin",
-      "type": "dep"
-    },
-    {
-      "manifest_version": "v1",
-      "output_name": "dhrystone",
-      "source": "/usr/local/google/home/pshickel/src/fuchsia-benchmarks/src/dhrystone/dhrystone.cmx",
-      "type": "manifest"
-    }
-  ]
-]
\ No newline at end of file
diff --git a/out/core.astro-release/lib/ld.so.1 b/out/core.astro-release/lib/ld.so.1
deleted file mode 100755
index 1d39253..0000000
--- a/out/core.astro-release/lib/ld.so.1
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/lib/libc++.so.2 b/out/core.astro-release/lib/libc++.so.2
deleted file mode 100755
index dc9d316..0000000
--- a/out/core.astro-release/lib/libc++.so.2
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/lib/libc++abi.so.1 b/out/core.astro-release/lib/libc++abi.so.1
deleted file mode 100755
index 5eb0a55..0000000
--- a/out/core.astro-release/lib/libc++abi.so.1
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/lib/libfdio.so b/out/core.astro-release/lib/libfdio.so
deleted file mode 100755
index 47ef705..0000000
--- a/out/core.astro-release/lib/libfdio.so
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/lib/libunwind.so.1 b/out/core.astro-release/lib/libunwind.so.1
deleted file mode 100755
index 39bba3b..0000000
--- a/out/core.astro-release/lib/libunwind.so.1
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/build/config/clang/c++-runtime-deps.stamp b/out/core.astro-release/obj/build/config/clang/c++-runtime-deps.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/build/config/clang/c++-runtime-deps.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/build/config/clang/clang-runtime-libs.stamp b/out/core.astro-release/obj/build/config/clang/clang-runtime-libs.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/build/config/clang/clang-runtime-libs.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/default.stamp b/out/core.astro-release/obj/default.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/default.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone.stamp b/out/core.astro-release/obj/src/dhrystone/dhrystone.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin.ninja b/out/core.astro-release/obj/src/dhrystone/dhrystone_bin.ninja
deleted file mode 100644
index 34b47d1..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin.ninja
+++ /dev/null
@@ -1,17 +0,0 @@
-defines = -DFUCHSIA_SDK_VERSION=0.20200420.1.1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0
-include_dirs = -I../.. -Igen -I../../third_party/fuchsia-sdk/pkg/zx/include
-cflags = -Wall -pedantic -O3 -ffast-math -I src -DTIME -fno-strict-aliasing -fcolor-diagnostics -fmerge-all-constants -fcomplete-member-pointers -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fPIC -O2 -fno-ident -fdata-sections -ffunction-sections -g0 -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -fvisibility=hidden --target=aarch64-fuchsia --sysroot=../../third_party/fuchsia-sdk/arch/arm64/sysroot -fomit-frame-pointer
-cflags_cc = -std=c++14 -isystem../../buildtools/linux64/clang-linux-amd64 -fno-exceptions -fno-rtti -fvisibility-inlines-hidden
-label_name = dhrystone_bin
-target_out_dir = obj/src/dhrystone
-target_output_name = dhrystone_bin
-
-build obj/src/dhrystone/dhrystone_bin/dhry_1.o: cxx ../../src/dhrystone/dhry_1.cc
-build obj/src/dhrystone/dhrystone_bin/dhry_2.o: cxx ../../src/dhrystone/dhry_2.cc
-
-build ./dhrystone_bin: link obj/src/dhrystone/dhrystone_bin/dhry_1.o obj/src/dhrystone/dhrystone_bin/dhry_2.o obj/third_party/fuchsia-sdk/pkg/zx/libzx.a || obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp obj/build/config/clang/c++-runtime-deps.stamp
-  ldflags = -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -Wl,-O2 -Wl,--gc-sections -Wl,--no-as-needed -lfdio -Wl,--as-needed --target=aarch64-fuchsia --sysroot=../../third_party/fuchsia-sdk/arch/arm64/sysroot -Wl,-rpath=\$$ORIGIN/ -Wl,-rpath-link= -L../../third_party/fuchsia-sdk/arch/arm64/lib
-  libs = -lpthread -lzircon
-  frameworks =
-  output_extension = 
-  output_dir = .
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_1.o b/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_1.o
deleted file mode 100644
index b30c805..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_1.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_2.o b/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_2.o
deleted file mode 100644
index 3deed83..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_bin/dhry_2.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_cmx.stamp b/out/core.astro-release/obj/src/dhrystone/dhrystone_cmx.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_cmx.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_package.stamp b/out/core.astro-release/obj/src/dhrystone/dhrystone_package.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_package.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-manifest.stamp b/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-manifest.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-manifest.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-metadata.stamp b/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-metadata.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/src/dhrystone/dhrystone_package__archive-metadata.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp b/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp b/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio.ninja b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio.ninja
deleted file mode 100644
index c3e3100..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio.ninja
+++ /dev/null
@@ -1,11 +0,0 @@
-defines = -DFUCHSIA_SDK_VERSION=0.20200420.1.1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0
-include_dirs = -I../.. -Igen -I../../third_party/fuchsia-sdk/pkg/fdio/include
-label_name = fdio
-target_out_dir = obj/third_party/fuchsia-sdk/pkg/fdio
-target_output_name = libfdio
-
-
-build obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a: alink || obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp
-  arflags =
-  output_extension = .a
-  output_dir = obj/third_party/fuchsia-sdk/pkg/fdio
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp
deleted file mode 100644
index e69de29..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp
+++ /dev/null
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
deleted file mode 100644
index 8b277f0..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
+++ /dev/null
@@ -1 +0,0 @@
-!<arch>
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/libzx.a b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
deleted file mode 100644
index 5db968d..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx.ninja b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx.ninja
deleted file mode 100644
index 0027893..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx.ninja
+++ /dev/null
@@ -1,35 +0,0 @@
-defines = -DFUCHSIA_SDK_VERSION=0.20200420.1.1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0
-include_dirs = -I../.. -Igen -I../../third_party/fuchsia-sdk/pkg/zx/include
-cflags = -fno-strict-aliasing -fcolor-diagnostics -fmerge-all-constants -fcomplete-member-pointers -Xclang -mllvm -Xclang -instcombine-lower-dbg-declare=0 -fPIC -O2 -fno-ident -fdata-sections -ffunction-sections -g0 -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -fvisibility=hidden --target=aarch64-fuchsia --sysroot=../../third_party/fuchsia-sdk/arch/arm64/sysroot -fomit-frame-pointer
-cflags_cc = -std=c++14 -isystem../../buildtools/linux64/clang-linux-amd64 -fno-exceptions -fno-rtti -fvisibility-inlines-hidden
-label_name = zx
-target_out_dir = obj/third_party/fuchsia-sdk/pkg/zx
-target_output_name = libzx
-
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/bti.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/channel.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/debuglog.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/event.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/eventpair.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/fifo.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/guest.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/interrupt.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/iommu.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/job.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/pager.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/port.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/process.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/profile.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/resource.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/socket.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/stream.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/thread.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/timer.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/vcpu.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/vmar.cc
-build obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o: cxx ../../third_party/fuchsia-sdk/pkg/zx/vmo.cc
-
-build obj/third_party/fuchsia-sdk/pkg/zx/libzx.a: alink obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o
-  arflags =
-  output_extension = .a
-  output_dir = obj/third_party/fuchsia-sdk/pkg/zx
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o
deleted file mode 100644
index f0fa4b0..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/bti.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o
deleted file mode 100644
index a1123aa..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/channel.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o
deleted file mode 100644
index ec743f8..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/debuglog.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o
deleted file mode 100644
index 787ad0f..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/event.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o
deleted file mode 100644
index ed66dde..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/eventpair.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o
deleted file mode 100644
index 863ff58..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/fifo.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o
deleted file mode 100644
index 6e32f39..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/guest.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o
deleted file mode 100644
index 3d529cd..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/interrupt.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o
deleted file mode 100644
index c96ec11..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/iommu.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o
deleted file mode 100644
index 9745437..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/job.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o
deleted file mode 100644
index af7d0ab..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/pager.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o
deleted file mode 100644
index af03506..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/port.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o
deleted file mode 100644
index 773741c..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/process.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o
deleted file mode 100644
index cf22e77..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/profile.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o
deleted file mode 100644
index 353ef7a..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/resource.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o
deleted file mode 100644
index 3a87b18..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/socket.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o
deleted file mode 100644
index b1df1c1..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/stream.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o
deleted file mode 100644
index 33db1fc..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/thread.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o
deleted file mode 100644
index d20e937..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/timer.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o
deleted file mode 100644
index d96ce6c..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vcpu.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o
deleted file mode 100644
index c1e70c8..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmar.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o b/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o
deleted file mode 100644
index ec486f4..0000000
--- a/out/core.astro-release/obj/third_party/fuchsia-sdk/pkg/zx/zx/vmo.o
+++ /dev/null
Binary files differ
diff --git a/out/core.astro-release/toolchain.ninja b/out/core.astro-release/toolchain.ninja
deleted file mode 100644
index c507c7d..0000000
--- a/out/core.astro-release/toolchain.ninja
+++ /dev/null
@@ -1,91 +0,0 @@
-rule solink
-  command = ../../buildtools/linux64/clang-linux-amd64/bin/clang++ -shared ${ldflags} -o "${output_dir}/${target_output_name}${output_extension}" -Wl,-soname="${target_output_name}${output_extension}" @"${output_dir}/${target_output_name}${output_extension}.rsp"
-  description = SOLINK ${output_dir}/${target_output_name}${output_extension}
-  rspfile = ${output_dir}/${target_output_name}${output_extension}.rsp
-  rspfile_content = -Wl,--whole-archive ${in} ${solibs} -Wl,--no-whole-archive  ${libs} 
-  restat = 1
-rule alink
-  command = rm -f ${out} && "../../buildtools/linux64/clang-linux-amd64/bin/llvm-ar" ${arflags} -r -c -s -D ${out} @"${out}.rsp"
-  description = AR ${out}
-  rspfile = ${out}.rsp
-  rspfile_content = ${in}
-rule stamp
-  command = touch ${out}
-  description = STAMP ${out}
-rule link
-  command = ../../buildtools/linux64/clang-linux-amd64/bin/clang++ ${ldflags} -o "${output_dir}/${target_output_name}${output_extension}" -Wl,--start-group @"${output_dir}/${target_output_name}${output_extension}.rsp" ${solibs} -Wl,--end-group   ${libs} 
-  description = LINK ${output_dir}/${target_output_name}${output_extension}
-  rspfile = ${output_dir}/${target_output_name}${output_extension}.rsp
-  rspfile_content = ${in}
-rule cxx
-  command =  ../../buildtools/linux64/clang-linux-amd64/bin/clang++ -MMD -MF ${out}.d ${defines} ${include_dirs} ${cflags} ${cflags_cc} -c ${in} -o ${out}
-  description = CXX ${out}
-  depfile = ${out}.d
-  deps = gcc
-rule solink_module
-  command = ../../buildtools/linux64/clang-linux-amd64/bin/clang++ -shared ${ldflags} -o "${output_dir}/${target_output_name}${output_extension}" -Wl,-soname="${target_output_name}${output_extension}" @"${output_dir}/${target_output_name}${output_extension}.rsp"
-  description = SOLINK_MODULE ${output_dir}/${target_output_name}${output_extension}
-  rspfile = ${output_dir}/${target_output_name}${output_extension}.rsp
-  rspfile_content = -Wl,--whole-archive ${in} ${solibs} -Wl,--no-whole-archive  ${libs} 
-rule cc
-  command =  ../../buildtools/linux64/clang-linux-amd64/bin/clang -MMD -MF ${out}.d ${defines} ${include_dirs} ${cflags} ${cflags_c} -c ${in} -o ${out}
-  description = CC ${out}
-  depfile = ${out}.d
-  deps = gcc
-rule asm
-  command =  ../../buildtools/linux64/clang-linux-amd64/bin/clang -MMD -MF ${out}.d ${defines} ${include_dirs} ${asmflags} -c ${in} -o ${out}
-  description = ASM ${out}
-  depfile = ${out}.d
-  deps = gcc
-rule copy
-  command = ln -f ${in} ${out} 2>/dev/null || (rm -rf ${out} && cp -af ${in} ${out})
-  description = COPY ${in} ${out}
-
-build obj/default.stamp: stamp obj/src/dhrystone/dhrystone.stamp
-build obj/build/config/clang/c++-runtime-deps.stamp: stamp || obj/build/config/clang/clang-runtime-libs.stamp
-build lib/libc++.so.2: copy ../../buildtools/linux64/clang-linux-amd64/lib/aarch64-unknown-fuchsia/c++/libc++.so.2.0
-build lib/libc++abi.so.1: copy ../../buildtools/linux64/clang-linux-amd64/lib/aarch64-unknown-fuchsia/c++/libc++abi.so.1.0
-build lib/libunwind.so.1: copy ../../buildtools/linux64/clang-linux-amd64/lib/aarch64-unknown-fuchsia/c++/libunwind.so.1.0
-
-build obj/build/config/clang/clang-runtime-libs.stamp: stamp lib/libc++.so.2 lib/libc++abi.so.1 lib/libunwind.so.1
-build obj/src/dhrystone/dhrystone.stamp: stamp ./dhrystone_bin obj/src/dhrystone/dhrystone_package.stamp
-subninja obj/src/dhrystone/dhrystone_bin.ninja
-build obj/src/dhrystone/dhrystone_cmx.stamp: stamp || ./dhrystone_bin
-rule __src_dhrystone_dhrystone_package___build_toolchain_fuchsia_arm64__rule
-  command = python ../../third_party/fuchsia-sdk/build/gn_run_binary.py ../../third_party/fuchsia-sdk/tools/pm -o gen/src/dhrystone/dhrystone -m gen/src/dhrystone/dhrystone/dhrystone.archive_manifest archive --output /usr/local/google/home/pshickel/src/fuchsia-benchmarks/out/core.astro-release/gen/src/dhrystone/dhrystone/dhrystone
-  description = ACTION //src/dhrystone:dhrystone_package(//build/toolchain/fuchsia:arm64)
-  restat = 1
-
-build gen/src/dhrystone/dhrystone/dhrystone.far: __src_dhrystone_dhrystone_package___build_toolchain_fuchsia_arm64__rule | ../../third_party/fuchsia-sdk/build/gn_run_binary.py ../../third_party/fuchsia-sdk/meta/manifest.json ../../third_party/fuchsia-sdk/tools/pm gen/src/dhrystone/dhrystone/dhrystone.archive_manifest gen/src/dhrystone/dhrystone/meta.far obj/src/dhrystone/dhrystone_package__archive-metadata.stamp
-
-build obj/src/dhrystone/dhrystone_package.stamp: stamp gen/src/dhrystone/dhrystone/dhrystone.far
-rule __src_dhrystone_dhrystone_package__archive-manifest___build_toolchain_fuchsia_arm64__rule
-  command = python ../../third_party/fuchsia-sdk/build/prepare_package_inputs.py --root-dir ../../ --out-dir . --app-name dhrystone --runtime-deps-file gen/src/dhrystone/dhrystone/dhrystone.runtime_deps --depfile-path gen/src/dhrystone/dhrystone_package_stamp.d --manifest-path gen/src/dhrystone/dhrystone/dhrystone.archive_manifest --build-ids-file gen/src/dhrystone/dhrystone/ids.txt --json-file /usr/local/google/home/pshickel/src/fuchsia-benchmarks/out/core.astro-release/gen/src/dhrystone/dhrystone_packaged_components_metadata.json
-  description = ACTION //src/dhrystone:dhrystone_package__archive-manifest(//build/toolchain/fuchsia:arm64)
-  restat = 1
-
-build gen/src/dhrystone/dhrystone/dhrystone.archive_manifest gen/src/dhrystone/dhrystone/ids.txt gen/src/dhrystone/dhrystone/package: __src_dhrystone_dhrystone_package__archive-manifest___build_toolchain_fuchsia_arm64__rule | ../../third_party/fuchsia-sdk/build/prepare_package_inputs.py gen/src/dhrystone/dhrystone/dhrystone.runtime_deps obj/src/dhrystone/dhrystone_cmx.stamp
-  depfile = gen/src/dhrystone/dhrystone_package_stamp.d
-
-build obj/src/dhrystone/dhrystone_package__archive-manifest.stamp: stamp gen/src/dhrystone/dhrystone/dhrystone.archive_manifest gen/src/dhrystone/dhrystone/ids.txt gen/src/dhrystone/dhrystone/package || obj/src/dhrystone/dhrystone_cmx.stamp
-rule __src_dhrystone_dhrystone_package__archive-metadata___build_toolchain_fuchsia_arm64__rule
-  command = python ../../third_party/fuchsia-sdk/build/gn_run_binary.py ../../third_party/fuchsia-sdk/tools/pm -o gen/src/dhrystone/dhrystone -m gen/src/dhrystone/dhrystone/dhrystone.archive_manifest build -depfile -output-package-manifest gen/src/dhrystone/dhrystone/package_manifest.json
-  description = ACTION //src/dhrystone:dhrystone_package__archive-metadata(//build/toolchain/fuchsia:arm64)
-  restat = 1
-
-build gen/src/dhrystone/dhrystone/meta.far gen/src/dhrystone/dhrystone/package_manifest.json: __src_dhrystone_dhrystone_package__archive-metadata___build_toolchain_fuchsia_arm64__rule | ../../third_party/fuchsia-sdk/build/gn_run_binary.py ../../third_party/fuchsia-sdk/meta/manifest.json ../../third_party/fuchsia-sdk/tools/pm gen/src/dhrystone/dhrystone/dhrystone.archive_manifest obj/src/dhrystone/dhrystone_package__archive-manifest.stamp
-  depfile = gen/src/dhrystone/dhrystone/meta.far.d
-
-build obj/src/dhrystone/dhrystone_package__archive-metadata.stamp: stamp gen/src/dhrystone/dhrystone/meta.far gen/src/dhrystone/dhrystone/package_manifest.json
-build obj/src/dhrystone/dhrystone_packaged_components_metadata.stamp: stamp obj/src/dhrystone/dhrystone_cmx.stamp
-build obj/third_party/fuchsia-sdk/build/config/runtime_library_group.stamp: stamp || obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
-build lib/ld.so.1: copy ../../third_party/fuchsia-sdk/arch/arm64/sysroot/dist/lib/ld.so.1
-
-build obj/third_party/fuchsia-sdk/build/config/sysroot_dist_libs.stamp: stamp lib/ld.so.1
-build obj/third_party/fuchsia-sdk/pkg/fdio/all.stamp: stamp obj/third_party/fuchsia-sdk/pkg/fdio/libfdio.a
-subninja obj/third_party/fuchsia-sdk/pkg/fdio/fdio.ninja
-build lib/libfdio.so: copy ../../third_party/fuchsia-sdk/arch/arm64/dist/libfdio.so
-
-build obj/third_party/fuchsia-sdk/pkg/fdio/fdio_dist_libs.stamp: stamp lib/libfdio.so
-build obj/third_party/fuchsia-sdk/pkg/zx/all.stamp: stamp obj/third_party/fuchsia-sdk/pkg/zx/libzx.a
-subninja obj/third_party/fuchsia-sdk/pkg/zx/zx.ninja