More simple cleanup of logging.