more RoF code removed.