Add more more efficient deletion checking