Extend remove notification from add notification

Removes code duplication by extending our 2nd notification off our first one.