more cleanup in the soundness proof