Removed the nfa stuff - no longer needed