Fix the deprecated code reported from Upgrade Status module