Make destroy safer - ensure local_system is updated when it is destroyed.