fix concurrency issues in parser due to regex reuse
remove duplicate class