diff --git a/velox/functions/prestosql/aggregates/AverageAggregate.h b/velox/functions/prestosql/aggregates/AverageAggregate.h
index e7dd46401eda..9e3bf8caa61d 100644
--- a/velox/functions/prestosql/aggregates/AverageAggregate.h
+++ b/velox/functions/prestosql/aggregates/AverageAggregate.h
@@ -164,23 +164,18 @@ class AverageAggregate : public exec::Aggregate {
     if (decodedPartial_.isConstantMapping()) {
       if (!decodedPartial_.isNullAt(0)) {
         auto decodedIndex = decodedPartial_.index(0);
-        if (!baseSumVector->isNullAt(decodedIndex)) {
           auto count = baseCountVector->valueAt(decodedIndex);
           auto sum = baseSumVector->valueAt(decodedIndex);
           rows.applyToSelected([&](vector_size_t i) {
             updateNonNullValue(groups[i], count, sum);
           });
-        }
       }
-    } else if (decodedPartial_.mayHaveNulls() || baseSumVector->mayHaveNulls()) {
+    } else if (decodedPartial_.mayHaveNulls()) {
       rows.applyToSelected([&](vector_size_t i) {
         if (decodedPartial_.isNullAt(i)) {
           return;
         }
         auto decodedIndex = decodedPartial_.index(i);
-        if (baseSumVector->isNullAt(decodedIndex)) {
-          return;
-        }
         updateNonNullValue(
             groups[i],
             baseCountVector->valueAt(decodedIndex),
diff --git a/velox/substrait/SubstraitToVeloxPlanValidator.cpp b/velox/substrait/SubstraitToVeloxPlanValidator.cpp
index 3bd768f0a7c6..3b443baced4e 100644
--- a/velox/substrait/SubstraitToVeloxPlanValidator.cpp
+++ b/velox/substrait/SubstraitToVeloxPlanValidator.cpp
@@ -16,9 +16,6 @@
 
 #include "velox/substrait/SubstraitToVeloxPlanValidator.h"
 #include "TypeUtils.h"
-#include "velox/functions/sparksql/Register.h"
-
-#include "velox/functions/prestosql/registration/RegistrationFunctions.h"
 
 namespace facebook::velox::substrait {
 
@@ -337,8 +334,6 @@ bool SubstraitToVeloxPlanValidator::validate(
 }
 
 bool SubstraitToVeloxPlanValidator::validate(const ::substrait::Plan& sPlan) {
-  functions::prestosql::registerAllScalarFunctions();
-  functions::sparksql::registerFunctions("");
   // Create plan converter and expression converter to help the validation.
   planConverter_->constructFunctionMap(sPlan);
   exprConverter_ = std::make_shared<SubstraitVeloxExprConverter>(