Merge "Remove ACC and other legacy bits from RS."