Got rid of old Lexer