Handle no role provider upgrades and some clean up