More logging cleanup