cleanup and replace antlr sv parser w/ apfe one.