More cleanup, and a much faster shutdown...