Merge "Cleanup ziparchive"