Merge "Clean up "logging"."