Revert "some more debugging"

This reverts commit c5bb599b8e2f573773778af687e7d86ee4748f45.
Revert "add envelope debugging"

This reverts commit b230cb1ee4089705a37749014b6313f854527e41.