UpgradeType: Getting rid of redundant code