Improve shutdown check
Auto remove children