Cleanup and zip download fix attempt