Refactor deletion of all files on exit

Refactor deletion of all files on exit #1378