Refactor sending data during rekey phase