More logging cleanup after dependency upgrade