[AS7-370] Notification support

code cleanup