Improved downloader and deleted unnecessary code