clean up data structures, remove old regex implementation