fix some bugs and remove the data download/unzip for upgrade job