Merge "Remove deprecated R1 code"