Merge pull request #1386 from jmgao/exit

Don't clean up after ourselves when exiting.