Removed duplicate notification code