Add back destroy fix unassign

Would it not be easier just to open this PR against UI rework?