Simplified pushing of new provider, fixed unlinking of provider.