Clean up and new download process (wip)