Refactoring of CleanUpTask
Merge pull request #1962 from systay/cleanuptask-cleanup

Refactoring of CleanUpTask