Removed notificationId hashMap