Clean up better after ourselves.