(#1658) - WIP - remove excessive destroy emits