removed  trackEvent and heartbeat