Better entity destruction semantics