Last version that does substitution with regexp

Changing it to stripping to avoid conflicts when the find is a substring of the replace.