Cleanup for accurate analytics.