Simplify clean-up-on-network-disconnect handling