Temporarily remove event analytics
Balancing improvements