small re-factoring; remove files that generates by antrl