Why do we have 2 heartbeat handler files? I think we probably want to remove this from the changeset.