Removal of Lexer and perf improvements