disable heartbeats
seperate imports
update helper retry
remove unreachable code