cleanup the notifications
add the source attribute to the notification messages