Simplify shutdown slightly