diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePlugin.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePlugin.scala
index f81eefec1..fa9124b2e 100644
--- a/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePlugin.scala
+++ b/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePlugin.scala
@@ -66,7 +66,7 @@ private[oap] class GazelleExecutorPlugin extends ExecutorPlugin {
   // N/A
 }
 
-private[oap] class GazelleSessionsExtensions extends (SparkSessionExtensions => Unit) {
+private[oap] class GazelleSessionExtensions extends (SparkSessionExtensions => Unit) {
   override def apply(exts: SparkSessionExtensions): Unit = {
     GazellePlugin.DEFAULT_INJECTORS.foreach(injector => injector.inject(exts))
   }
@@ -93,7 +93,7 @@ private[oap] object GazellePlugin {
       .getCanonicalName)
   val SPARK_SESSION_EXTS_KEY: String = StaticSQLConf.SPARK_SESSION_EXTENSIONS.key
   val GAZELLE_SESSION_EXTENSION_NAME: String = Objects.requireNonNull(
-    classOf[GazelleSessionsExtensions].getCanonicalName)
+    classOf[GazelleSessionExtensions].getCanonicalName)
 
   /**
    * Specify all injectors that Gazelle is using in following list.
diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePluginConfig.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePluginConfig.scala
index 68e1c7373..a1816a889 100644
--- a/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePluginConfig.scala
+++ b/native-sql-engine/core/src/main/scala/com/intel/oap/GazellePluginConfig.scala
@@ -33,7 +33,6 @@ class GazellePluginConfig(conf: SQLConf) extends Logging {
       try source.mkString
       finally source.close()
     //TODO(): check CPU flags to enable/disable AVX512
-    return true
     if (lines.contains("GenuineIntel")) {
       return true
     } else {
diff --git a/native-sql-engine/core/src/main/scala/com/intel/oap/extension/DriverOverrides.scala b/native-sql-engine/core/src/main/scala/com/intel/oap/extension/DriverOverrides.scala
deleted file mode 100644
index 58d9d0828..000000000
--- a/native-sql-engine/core/src/main/scala/com/intel/oap/extension/DriverOverrides.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.intel.oap.extension
-
-class DriverOverrides {
-
-}