removed heartbeat, added retry logic in subscribe thread