removed regexps