debug cleanup

the imap/folder stuff was more than was required now that things are stable.

the testhelper message merge logic is likely to need to be modified in the
future, and its debug is very helpful for that, so just commenting that out.