Refactor code into a StripPrefix function
Merge pull request #444 from peternewman/e1.37-2

Refactor code into a StripPrefix function