Further work removing RP prefixes