finish Automaton removal
Merge pull request #293 from Palmer-JC/master

finish Automaton removal