disable heartbeats
seperate imports
update helper retry
remove unreachable code
Merge branch 'master' into channel

* master:
  remove unreachable code
  update helper retry
  seperate imports
  disable heartbeats