remove NotificationMessage for simplicity