Merge "Remove Notification code for updated events"