Add back destroy fix unassign

Since this is introduces as a method, it should be used in all the places where this is done manually. e.g. deployment_controller and maybe other places.