removed unused parts of lexer/parser

Some of these will be added back (from code history) on need-basis.
Also, some syntax fixes in tests.