removed old tokenization support
correct parsing, UDF work begins now