Cleanup and add progress hook