removing most regexes