Merge "Clean up logging"