If Rarity NEEDS to remain in the game, then remove it from Gear to enable more endgame builds, and assign it to its own unique system with untradeable account-based progression. This approach would make it more engaging to target-farm currency, league mechanics, and item bases.
