Changes to remove the P+ notification messages.
An initial pass