Overhaul for testing/build cleanup, etc