R4R: Fixes Upgrades

dead code