initial logging cleanup

WIP