Restore the FilesCleaner Component.
Merge pull request #4166 from HassenRiahi/RestoreFilesCleaner

Restore the FilesCleaner Component.