Clean up archive downloader, fixes #1630