Remove references to rcs_id