Improve delete for editable inside editable case