update rrc and rrca for esil-gb and remove old code