Regexp union refactor code, and remove v2 tags

Removed unnecessary code, moved all the logic to 1 method