diff --git a/velox/functions/lib/Re2Functions.cpp b/velox/functions/lib/Re2Functions.cpp
index cddb7f69aa6ae..52f762f08b941 100644
--- a/velox/functions/lib/Re2Functions.cpp
+++ b/velox/functions/lib/Re2Functions.cpp
@@ -1222,7 +1222,7 @@ void re2SplitAll(
   resultWriter.commit();
 }
 
-class Re2SplitAllConstantPattern final : public VectorFunction {
+class Re2SplitAllConstantPattern final : public exec::VectorFunction {
  public:
   explicit Re2SplitAllConstantPattern(StringView pattern)
       : re_(toStringPiece(pattern), RE2::Quiet) {}
@@ -1231,7 +1231,7 @@ class Re2SplitAllConstantPattern final : public VectorFunction {
       const SelectivityVector& rows,
       std::vector<VectorPtr>& args,
       const TypePtr& /* outputType */,
-      EvalCtx& context,
+      exec::EvalCtx& context,
       VectorPtr& resultRef) const final {
     VELOX_CHECK(args.size() == 2);
     try {
@@ -2016,9 +2016,9 @@ re2ExtractAllSignatures() {
   };
 }
 
-std::shared_ptr<VectorFunction> makeRe2SplitAll(
+std::shared_ptr<exec::VectorFunction> makeRe2SplitAll(
     const std::string& name,
-    const std::vector<VectorFunctionArg>& inputArgs,
+    const std::vector<exec::VectorFunctionArg>& inputArgs,
     const core::QueryConfig& /*config*/) {
   auto numArgs = inputArgs.size();
   VELOX_USER_CHECK_EQ(
@@ -2045,19 +2045,6 @@ std::shared_ptr<VectorFunction> makeRe2SplitAll(
 
   auto pattern = constantPattern->as<ConstantVector<StringView>>()->valueAt(0);
 
-  // void apply(
-  //     const SelectivityVector& rows,
-  //     std::vector<VectorPtr>& args,
-  //     const TypePtr& /* outputType */,
-  //     EvalCtx& context,
-  //     VectorPtr& resultRef) const final {
-  //   try {
-  //     checkForBadPattern(re_);
-  //   } catch (const std::exception& e) {
-  //     context.setErrors(rows, std::current_exception());
-  //     return;
-  //   }
-
   return std::make_shared<Re2SplitAllConstantPattern>(pattern);
 }
 
diff --git a/velox/vector/arrow/Bridge.cpp b/velox/vector/arrow/Bridge.cpp
index 8e9d9ba67ae60..639248b6b7fec 100644
--- a/velox/vector/arrow/Bridge.cpp
+++ b/velox/vector/arrow/Bridge.cpp
@@ -272,9 +272,6 @@ const char* exportArrowFormatStr(
       return "+m"; // map
     case TypeKind::ROW:
       return "+s"; // struct
-    case TypeKind::UNKNOWN:
-      return "n";
-
     default:
       VELOX_NYI("Unable to map type '{}' to ArrowSchema.", type->kind());
   }
@@ -631,7 +628,6 @@ void exportFlat(
     case TypeKind::HUGEINT:
     case TypeKind::REAL:
     case TypeKind::DOUBLE:
-    case TypeKind::UNKNOWN:
     case TypeKind::TIMESTAMP:
     case TypeKind::UNKNOWN:
       exportValues(vec, rows, options, out, pool, holder);
diff --git a/velox/vector/arrow/tests/ArrowBridgeSchemaTest.cpp b/velox/vector/arrow/tests/ArrowBridgeSchemaTest.cpp
index 20c93e263a289..881aa0b5aad6b 100644
--- a/velox/vector/arrow/tests/ArrowBridgeSchemaTest.cpp
+++ b/velox/vector/arrow/tests/ArrowBridgeSchemaTest.cpp
@@ -260,8 +260,6 @@ TEST_F(ArrowBridgeSchemaExportTest, constant) {
   testConstant(ROW({UNKNOWN(), UNKNOWN()}), "+s");
 }
 
-}
-
 class ArrowBridgeSchemaImportTest : public ArrowBridgeSchemaExportTest {
  protected:
   TypePtr testSchemaImport(const char* format) {