Added more robust deletion

v3.3.0