remove Regexer and move related code to Lexer