Improve Tool Cleanup

In previous releases, the tool would leave behind a tmp folder in the directory where it runs. This is fixed in this release.