Clean up AnalyticsLogger based on code review feedback