improve remove/destroy handling