Cleanup, and ensure unzip is available