Cleanup of notify providers

Something went wrong with latest merge, I think, this resulted in double notifications for some providers.