removed Token::Type mapper