R4R: Fixes Upgrades

yeah, we don't use it anywhere anymore.