removed notification code