diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md b/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
deleted file mode 100644
index c136140744..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## opensearch_sql_odbc
-
-The connector files in `opensearch_sql_odbc` can be used to connect to OpenSearch server in Tableau.
-
-* These connector files remove and modify a set of unsupported functions and operations.
-* It includes set of capabilities to customize and tune connector behavior
-
-To use this connector with Tableau, [Package the connector](https://tableau.github.io/connector-plugin-sdk/docs/package-sign) and [Run Packaged Connector (TACO file)](https://tableau.github.io/connector-plugin-sdk/docs/run-taco)
\ No newline at end of file
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd b/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
deleted file mode 100644
index f7ae8da245..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
+++ /dev/null
@@ -1,16 +0,0 @@
-<connection-dialog class='opensearch_sql_odbc'>
-  <connection-config>  
-    <authentication-mode value='ComboBoxIntegrated' />
-        <authentication-options>
-            <option name="None" value="NONE" default="true" />
-            <option name="Integrated" value="AWS_SIGV4" />
-            <option name="UsernameAndPassword" value="BASIC" />
-        </authentication-options>
-    <port-prompt value="Port: " default="9200" />
-    <show-ssl-checkbox value="true" />
-    <vendor1-prompt value="Region: " />
-    <vendor2-prompt value="Additional Options: " />
-    <has-databases value="false" />
-    <has-schemas value="false" />
-  </connection-config>
-</connection-dialog>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
deleted file mode 100644
index b5a04d1777..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function dsbuilder(attr){
-    var params = {};
-
-    // Set host information in connection string
-    params["SERVER"] = attr[connectionHelper.attributeServer];
-    params["PORT"] = attr[connectionHelper.attributePort];
-
-    // Set authentication values in connection string
-    var authAttrValue = attr[connectionHelper.attributeAuthentication];
-    params["Auth"] = attr[connectionHelper.attributeAuthentication];
-    if (authAttrValue == "AWS_SIGV4"){
-        params["Region"] = attr[connectionHelper.attributeVendor1];
-    } else if (authAttrValue == "BASIC"){
-        params["UID"] = attr[connectionHelper.attributeUsername];
-        params["PWD"] = attr[connectionHelper.attributePassword];
-    }
-
-    // Set SSL value in connection string 
-    if (attr[connectionHelper.attributeSSLMode] == "require"){
-        params["useSSL"] = "1";
-    } else {
-        params["useSSL"] = "0";
-    }
-
-    // Parse additional options and add in connection string
-    var odbcConnectStringExtrasMap = {};
-    const attributeODBCConnectStringExtras = "vendor2";
-    if (attributeODBCConnectStringExtras in attr){
-        odbcConnectStringExtrasMap = connectionHelper.ParseODBCConnectString(attr[attributeODBCConnectStringExtras]);
-    }
-    for (var key in odbcConnectStringExtrasMap){
-        params[key] = odbcConnectStringExtrasMap[key];
-    }
-
-    // Format the attributes as 'key=value'
-    var formattedParams = [];
-    formattedParams.push(connectionHelper.formatKeyValuePair(driverLocator.keywordDriver, driverLocator.locateDriver(attr)));
-    for (var key in params){
-        formattedParams.push(connectionHelper.formatKeyValuePair(key, params[key]));
-    }
-    return formattedParams;
-})
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
deleted file mode 100644
index 68c376270c..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<tdr class='opensearch_sql_odbc'>
-  <connection-resolver>
-    <connection-builder>
-      <script file='connectionBuilder.js'/>
-    </connection-builder>
-    <connection-normalizer>
-      <required-attributes>
-        <attribute-list>
-          <attr>server</attr>
-          <attr>port</attr>
-          <attr>authentication</attr>
-          <attr>username</attr>
-          <attr>password</attr>
-          <attr>sslmode</attr>
-          <attr>vendor1</attr>
-          <attr>vendor2</attr>
-        </attribute-list>
-      </required-attributes>
-    </connection-normalizer>
-  </connection-resolver>
-  <driver-resolver>
-    <driver-match >
-      <driver-name type='regex'>OpenSearch SQL ODBC*</driver-name>
-    </driver-match>
-  </driver-resolver>
-</tdr>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
deleted file mode 100644
index e34857ce07..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dialect name='OpenSearchSqlOdbcDialect'
-         class='opensearch_sql_odbc'
-         base='MySQL41UnicodeDriverDialect'
-         version='18.1'>   
-   <function-map>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND NOT %2 OR NOT %1 AND %2)</formula>
-            <argument type='bool' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND %2 = 0 OR NOT %1 AND %2 &lt;&gt; 0)</formula>
-            <argument type='bool' />
-            <argument type='int' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 = 0 AND %2 OR %1 &lt;&gt; 0 AND NOT %2)</formula>
-            <argument type='int' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='str' />
-            <argument type='str' />
-        </function>
-    
-        <function group='date' name='DAYOFYEAR' return-type='int'>
-            <formula>DAY_OF_YEAR(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFMONTH' return-type='int'>
-            <formula>DAY_OF_MONTH(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFWEEK' return-type='int'>
-            <formula>DAY_OF_WEEK(%1)</formula>
-            <argument type='date' />
-        </function>
-
-        <remove-function name='ASCII'>
-            <argument type='str' />
-        </remove-function>
-
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />
-        </remove-function>
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='int' />        
-        </remove-function>
-        <remove-function name='FINDNTH'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />        
-        </remove-function>
-
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEPARSE'>
-            <argument type='localstr' />
-            <argument type='str' />
-        </remove-function>
-
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEADD'>
-            <argument type='localstr' />
-            <argument type='int' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='DATEADD'>
-            <argument type='localstr' />
-            <argument type='real' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='USEC_TO_TIMESTAMP'>
-            <argument type='int' />
-        </remove-function>
-
-        <remove-function name='TIMESTAMP_TO_USEC'>
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='MAX'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='MIN'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='datetime' />
-        </remove-function> 
-
-        <remove-function name='STDEV'>
-            <argument type='real' />
-        </remove-function>  
-
-        <remove-function name='STDEVP'>
-            <argument type='real' />
-        </remove-function>   
-
-        <remove-function name='VAR'>
-            <argument type='real' />
-        </remove-function> 
-
-        <remove-function name='VARP'>
-            <argument type='real' />
-        </remove-function>   
- 
-        <remove-function name='!='>
-            <argument type='str' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='str' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>   
-
-        <remove-function name='+'>
-            <argument type='datetime' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='datetime' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='date' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='date' />
-            <argument type='int' />
-        </remove-function>   
-        
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>                   
-   </function-map>
-</dialect>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
deleted file mode 100644
index 1d51e03f8b..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<connector-plugin class='opensearch_sql_odbc' superclass='odbc' plugin-version='1.2.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
-  <vendor-information>
-      <company name="OpenSearch for ES"/>
-      <support-link url="https://github.com/opensearch-project/sql"/>
-      <driver-download-link url="https://github.com/opensearch-project/sql"/>
-  </vendor-information>
-  <connection-customization class="opensearch_sql_odbc" enabled="true" version="10.0">
-    <vendor name="OpenSearch for ES"/>
-    <driver name="SQL"/>
-    <customizations>
-      <customization name="CAP_CREATE_TEMP_TABLES" value="no"/>
-      <customization name="CAP_SUPPRESS_DISCOVERY_QUERIES" value="yes" />
-      <customization name="CAP_SELECT_INTO" value="no"/>
-      <customization name="CAP_SELECT_TOP_INTO" value="no"/>
-      <customization name="CAP_QUERY_BOOLEXPR_TO_INTEXPR" value="no"/>
-      <customization name="CAP_QUERY_GROUP_BY_BOOL" value="yes"/>
-      <customization name="CAP_QUERY_GROUP_BY_DEGREE" value="yes"/>
-      <customization name="CAP_QUERY_SORT_BY" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES" value="yes"/>
-      <customization name="CAP_QUERY_TOP_N" value="yes"/>
-      <customization name="CAP_QUERY_TOP_SAMPLE" value="yes"/>
-      <customization name="CAP_QUERY_TOP_SAMPLE_PERCENT" value="yes"/>
-      <customization name="CAP_QUERY_WHERE_FALSE_METADATA" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES_WITH_TOP" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_LEFT" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="yes"/>
-      <customization name="CAP_QUERY_ALLOW_PARTIAL_AGGREGATION" value="no"/>
-      <customization name="CAP_QUERY_TIME_REQUIRES_CAST" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_FORCE_NUM_PREC_RADIX_10" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_FORCE_LENGTH_AS_PRECISION" value="yes"/>
-      <customization name="CAP_ODBC_SUPPRESS_INFO_SCHEMA_TABLES" value="yes"/>
-      <customization name="CAP_ODBC_SUPPRESS_PG_TEMP_SCHEMA_TABLES" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_SUPPRESS_SQLSTATISTICS_API" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="no"/>
-      <customization name="CAP_CONNECT_STORED_PROCEDURE" value="no"/>
-      <!-- 
-      CAP_SUPPRESS_GET_SERVER_TIME will fix the error while creating extract in tableau.
-      This can be removed when OpenSearch supports query without FROM clause.
-      For smore details: https://community.tableau.com/message/1092123?et=watches.email.thread#1092123
-      -->
-      <customization name="CAP_SUPPRESS_GET_SERVER_TIME" value="yes"/>
-    </customizations>
-  </connection-customization>
-  <connection-dialog file='connection-dialog.tcd'/>
-  <connection-resolver file="connectionResolver.tdr"/>
-  <dialect file='dialect.tdd'/>
-</connector-plugin>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco b/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
deleted file mode 100644
index b90cd86d3c..0000000000
Binary files a/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco and /dev/null differ