further clean up the logging