Tidy up the post-build (or failure) cleanups