Added cleanup for notifications