Improve to delete