remove email notification
use database index