Fix continuous delete performance issue