Removed notification code from view