New regex for parsing terms (WAY SIMPLER)
Remove regex param from method
Comment out code slated for removal
Delete regex construction method
Remove regex constants