Cleaning up and building