Fix issue 2024 - add cleanup task