Make lexer work with new version of Forvie
Remove group stuff