removes unnecesary prefix stripping and replacement

 removes unnecesary prefix stripping and replacement