Remove R_a and R_b from SA msg and refactor