logging cleanup
build on gordon