some more cleanup (mostly removal of debug/logging code)
2 files changed