Remove need for analytics