Update to close on destroy