Make the cleanup task working with the latest fog