Remove DownloadClient and move its logic to Master