Cleanup of make_lib_zip