Add back destroy fix unassign

I thought this would make it easier to factor out and make it clear that it is preparing the method for destroying rather than changing the destroy behaviour.