Improve delete method