Upgrade plugins and remove pgp plugin