plugin upgrades and cleanup