Removing test + build cruft