WIP - huge change to remove all kinds of dead code from codegen and parser refactorings