improve cleanup; release 2