making upgrades work well, now old ones get removed