Fix cleanup not running on successful execution