Clean up duped Heartbeat code
Merge