Merge "Make sure cleanup is always done when task is removed"