Clean up some more of the logging