Add pack retaining.
Switch back to using Cleanup.
no message