More changes to RegEx scrubbing