Removed lexer second pass