support NotificationBuilder Added
Code clean up