Merge "Clean up logging code."