HCOLL-99 refactored out the heartbeat code