parser cleanup
clean up code gen