Clean up regexps