Clean up.  Close #4