removed analytics.
added service components.