Remove the notification provider, use default notification and add a key when necessary.

[bilalesi]