Make sure we clean up after ourselves