cleanup shutdown sequence a bit, the block look-ahead thread still throws