Small improvement to service deleting procedure