Add back destroy fix unassign

OK