Attempt to improve file cleaning.
Merge pull request #51 from nZEDb/dev

Attempt to improve file cleaning.