skip duplicate notification handling and delete bug