Tidy downloader.

This does lose progress on the listeners for downloading,
do we care?