Finish upgradingFrom24