Just stop with the upgrade items being available through the most braindead way possible and make people earn their fully upgraded gear.