Minor refactoring in code that deletes files/folders.
Merge pull request #266 from adobe/glenn/code-cleanup

Minor refactoring in code that deletes files/folders.