More logging removed ... will make this conditional later