Improve delete service