NEXUS-6182: More logging cleanup