initial logging cleanup; removed a bit of old and unused code