logging-v2: code cleanup