cleaning up more of the logging.