Do not import from legacy FileDownloader class
[wdr] fix up imports
Remove unused imports