Removed references to analytics
Removed references to events