improve remove/destroy handling (memory)