Remove trackEvent and change notificationId class