removes unnecesary prefix stripping and replacement
Merge pull request #46 from G5/refactor-84432206

 removes unnecesary prefix stripping and replacement