Improve the deletion