Cleanup after ourselves a little