Changed NotificationBuilder and removed timestamp if possible