More changes to RegEx Scrubbing