diff --git a/sql-odbc/src/PowerBIConnector/Diagnostics.pqm b/bi-connectors/PowerBIConnector/Diagnostics.pqm
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/Diagnostics.pqm
rename to bi-connectors/PowerBIConnector/Diagnostics.pqm
diff --git a/sql-odbc/src/PowerBIConnector/OdbcConstants.pqm b/bi-connectors/PowerBIConnector/OdbcConstants.pqm
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/OdbcConstants.pqm
rename to bi-connectors/PowerBIConnector/OdbcConstants.pqm
diff --git a/sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids b/bi-connectors/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids
rename to bi-connectors/PowerBIConnector/PBIDSExamples/sqlodbc_import.pbids
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.mproj
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.mproj
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.mproj
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.pq
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.query.pq
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector.query.pq
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.query.pq
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector16.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector16.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector16.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector16.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector20.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector20.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector20.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector20.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector24.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector24.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector24.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector24.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector32.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector32.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector32.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector32.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector40.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector40.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector40.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector40.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector48.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector48.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector48.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector48.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector64.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector64.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector64.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector64.png
diff --git a/sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector80.png b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector80.png
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/SqlOdbcPBIConnector80.png
rename to bi-connectors/PowerBIConnector/SqlOdbcPBIConnector80.png
diff --git a/sql-odbc/src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez b/bi-connectors/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez
rename to bi-connectors/PowerBIConnector/bin/Release/SqlOdbcPBIConnector.mez
diff --git a/sql-odbc/src/PowerBIConnector/resources.resx b/bi-connectors/PowerBIConnector/resources.resx
similarity index 100%
rename from sql-odbc/src/PowerBIConnector/resources.resx
rename to bi-connectors/PowerBIConnector/resources.resx
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/README.md b/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/README.md
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd b/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/dialect.tdd
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/manifest.xml
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco b/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
rename to bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/README.md b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/README.md
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
diff --git a/sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco
similarity index 100%
rename from sql-odbc/src/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco
rename to bi-connectors/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco
diff --git a/sql-odbc/LICENSE b/sql-odbc/LICENSE
deleted file mode 100644
index f49a4e16e6..0000000000
--- a/sql-odbc/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/sql-odbc/LICENSE.txt b/sql-odbc/LICENSE.txt
new file mode 100644
index 0000000000..f2ff00e7d8
--- /dev/null
+++ b/sql-odbc/LICENSE.txt
@@ -0,0 +1,961 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+
+		       Version 2, June 1991
+
+
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+
+                    675 Mass Ave, Cambridge, MA 02139, USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+
+ of this license document, but changing it is not allowed.
+
+
+
+[This is the first released version of the library GPL.  It is
+
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+
+
+			    Preamble
+
+
+
+  The licenses for most software are designed to take away your
+
+freedom to share and change it.  By contrast, the GNU General Public
+
+Licenses are intended to guarantee your freedom to share and change
+
+free software--to make sure the software is free for all its users.
+
+
+
+  This license, the Library General Public License, applies to some
+
+specially designated Free Software Foundation software, and to any
+
+other libraries whose authors decide to use it.  You can use it for
+
+your libraries, too.
+
+
+
+  When we speak of free software, we are referring to freedom, not
+
+price.  Our General Public Licenses are designed to make sure that you
+
+have the freedom to distribute copies of free software (and charge for
+
+this service if you wish), that you receive source code or can get it
+
+if you want it, that you can change the software or use pieces of it
+
+in new free programs; and that you know you can do these things.
+
+
+
+  To protect your rights, we need to make restrictions that forbid
+
+anyone to deny you these rights or to ask you to surrender the rights.
+
+These restrictions translate to certain responsibilities for you if
+
+you distribute copies of the library, or if you modify it.
+
+
+
+  For example, if you distribute copies of the library, whether gratis
+
+or for a fee, you must give the recipients all the rights that we gave
+
+you.  You must make sure that they, too, receive or can get the source
+
+code.  If you link a program with the library, you must provide
+
+complete object files to the recipients so that they can relink them
+
+with the library, after making changes to the library and recompiling
+
+it.  And you must show them these terms so they know their rights.
+
+
+
+  Our method of protecting your rights has two steps: (1) copyright
+
+the library, and (2) offer you this license which gives you legal
+
+permission to copy, distribute and/or modify the library.
+
+
+
+  Also, for each distributor's protection, we want to make certain
+
+that everyone understands that there is no warranty for this free
+
+library.  If the library is modified by someone else and passed on, we
+
+want its recipients to know that what they have is not the original
+
+version, so that any problems introduced by others will not reflect on
+
+the original authors' reputations.
+
+
+
+  Finally, any free program is threatened constantly by software
+
+patents.  We wish to avoid the danger that companies distributing free
+
+software will individually obtain patent licenses, thus in effect
+
+transforming the program into proprietary software.  To prevent this,
+
+we have made it clear that any patent must be licensed for everyone's
+
+free use or not licensed at all.
+
+
+
+  Most GNU software, including some libraries, is covered by the ordinary
+
+GNU General Public License, which was designed for utility programs.  This
+
+license, the GNU Library General Public License, applies to certain
+
+designated libraries.  This license is quite different from the ordinary
+
+one; be sure to read it in full, and don't assume that anything in it is
+
+the same as in the ordinary license.
+
+
+
+  The reason we have a separate public license for some libraries is that
+
+they blur the distinction we usually make between modifying or adding to a
+
+program and simply using it.  Linking a program with a library, without
+
+changing the library, is in some sense simply using the library, and is
+
+analogous to running a utility program or application program.  However, in
+
+a textual and legal sense, the linked executable is a combined work, a
+
+derivative of the original library, and the ordinary General Public License
+
+treats it as such.
+
+
+
+  Because of this blurred distinction, using the ordinary General
+
+Public License for libraries did not effectively promote software
+
+sharing, because most developers did not use the libraries.  We
+
+concluded that weaker conditions might promote sharing better.
+
+
+
+  However, unrestricted linking of non-free programs would deprive the
+
+users of those programs of all benefit from the free status of the
+
+libraries themselves.  This Library General Public License is intended to
+
+permit developers of non-free programs to use free libraries, while
+
+preserving your freedom as a user of such programs to change the free
+
+libraries that are incorporated in them.  (We have not seen how to achieve
+
+this as regards changes in header files, but we have achieved it as regards
+
+changes in the actual functions of the Library.)  The hope is that this
+
+will lead to faster development of free libraries.
+
+
+
+  The precise terms and conditions for copying, distribution and
+
+modification follow.  Pay close attention to the difference between a
+
+"work based on the library" and a "work that uses the library".  The
+
+former contains code derived from the library, while the latter only
+
+works together with the library.
+
+
+
+  Note that it is possible for a library to be covered by the ordinary
+
+General Public License rather than by this special one.
+
+
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+
+  0. This License Agreement applies to any software library which
+
+contains a notice placed by the copyright holder or other authorized
+
+party saying it may be distributed under the terms of this Library
+
+General Public License (also called "this License").  Each licensee is
+
+addressed as "you".
+
+
+
+  A "library" means a collection of software functions and/or data
+
+prepared so as to be conveniently linked with application programs
+
+(which use some of those functions and data) to form executables.
+
+
+
+  The "Library", below, refers to any such software library or work
+
+which has been distributed under these terms.  A "work based on the
+
+Library" means either the Library or any derivative work under
+
+copyright law: that is to say, a work containing the Library or a
+
+portion of it, either verbatim or with modifications and/or translated
+
+straightforwardly into another language.  (Hereinafter, translation is
+
+included without limitation in the term "modification".)
+
+
+
+  "Source code" for a work means the preferred form of the work for
+
+making modifications to it.  For a library, complete source code means
+
+all the source code for all modules it contains, plus any associated
+
+interface definition files, plus the scripts used to control compilation
+
+and installation of the library.
+
+
+
+  Activities other than copying, distribution and modification are not
+
+covered by this License; they are outside its scope.  The act of
+
+running a program using the Library is not restricted, and output from
+
+such a program is covered only if its contents constitute a work based
+
+on the Library (independent of the use of the Library in a tool for
+
+writing it).  Whether that is true depends on what the Library does
+
+and what the program that uses the Library does.
+
+
+
+  1. You may copy and distribute verbatim copies of the Library's
+
+complete source code as you receive it, in any medium, provided that
+
+you conspicuously and appropriately publish on each copy an
+
+appropriate copyright notice and disclaimer of warranty; keep intact
+
+all the notices that refer to this License and to the absence of any
+
+warranty; and distribute a copy of this License along with the
+
+Library.
+
+
+
+  You may charge a fee for the physical act of transferring a copy,
+
+and you may at your option offer warranty protection in exchange for a
+
+fee.
+
+
+
+  2. You may modify your copy or copies of the Library or any portion
+
+of it, thus forming a work based on the Library, and copy and
+
+distribute such modifications or work under the terms of Section 1
+
+above, provided that you also meet all of these conditions:
+
+
+
+    a) The modified work must itself be a software library.
+
+
+
+    b) You must cause the files modified to carry prominent notices
+
+    stating that you changed the files and the date of any change.
+
+
+
+    c) You must cause the whole of the work to be licensed at no
+
+    charge to all third parties under the terms of this License.
+
+
+
+    d) If a facility in the modified Library refers to a function or a
+
+    table of data to be supplied by an application program that uses
+
+    the facility, other than as an argument passed when the facility
+
+    is invoked, then you must make a good faith effort to ensure that,
+
+    in the event an application does not supply such function or
+
+    table, the facility still operates, and performs whatever part of
+
+    its purpose remains meaningful.
+
+
+
+    (For example, a function in a library to compute square roots has
+
+    a purpose that is entirely well-defined independent of the
+
+    application.  Therefore, Subsection 2d requires that any
+
+    application-supplied function or table used by this function must
+
+    be optional: if the application does not supply it, the square
+
+    root function must still compute square roots.)
+
+
+
+These requirements apply to the modified work as a whole.  If
+
+identifiable sections of that work are not derived from the Library,
+
+and can be reasonably considered independent and separate works in
+
+themselves, then this License, and its terms, do not apply to those
+
+sections when you distribute them as separate works.  But when you
+
+distribute the same sections as part of a whole which is a work based
+
+on the Library, the distribution of the whole must be on the terms of
+
+this License, whose permissions for other licensees extend to the
+
+entire whole, and thus to each and every part regardless of who wrote
+
+it.
+
+
+
+Thus, it is not the intent of this section to claim rights or contest
+
+your rights to work written entirely by you; rather, the intent is to
+
+exercise the right to control the distribution of derivative or
+
+collective works based on the Library.
+
+
+
+In addition, mere aggregation of another work not based on the Library
+
+with the Library (or with a work based on the Library) on a volume of
+
+a storage or distribution medium does not bring the other work under
+
+the scope of this License.
+
+
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+
+License instead of this License to a given copy of the Library.  To do
+
+this, you must alter all the notices that refer to this License, so
+
+that they refer to the ordinary GNU General Public License, version 2,
+
+instead of to this License.  (If a newer version than version 2 of the
+
+ordinary GNU General Public License has appeared, then you can specify
+
+that version instead if you wish.)  Do not make any other change in
+
+these notices.
+
+
+
+  Once this change is made in a given copy, it is irreversible for
+
+that copy, so the ordinary GNU General Public License applies to all
+
+subsequent copies and derivative works made from that copy.
+
+
+
+  This option is useful when you wish to copy part of the code of
+
+the Library into a program that is not a library.
+
+
+
+  4. You may copy and distribute the Library (or a portion or
+
+derivative of it, under Section 2) in object code or executable form
+
+under the terms of Sections 1 and 2 above provided that you accompany
+
+it with the complete corresponding machine-readable source code, which
+
+must be distributed under the terms of Sections 1 and 2 above on a
+
+medium customarily used for software interchange.
+
+
+
+  If distribution of object code is made by offering access to copy
+
+from a designated place, then offering equivalent access to copy the
+
+source code from the same place satisfies the requirement to
+
+distribute the source code, even though third parties are not
+
+compelled to copy the source along with the object code.
+
+
+
+  5. A program that contains no derivative of any portion of the
+
+Library, but is designed to work with the Library by being compiled or
+
+linked with it, is called a "work that uses the Library".  Such a
+
+work, in isolation, is not a derivative work of the Library, and
+
+therefore falls outside the scope of this License.
+
+
+
+  However, linking a "work that uses the Library" with the Library
+
+creates an executable that is a derivative of the Library (because it
+
+contains portions of the Library), rather than a "work that uses the
+
+library".  The executable is therefore covered by this License.
+
+Section 6 states terms for distribution of such executables.
+
+
+
+  When a "work that uses the Library" uses material from a header file
+
+that is part of the Library, the object code for the work may be a
+
+derivative work of the Library even though the source code is not.
+
+Whether this is true is especially significant if the work can be
+
+linked without the Library, or if the work is itself a library.  The
+
+threshold for this to be true is not precisely defined by law.
+
+
+
+  If such an object file uses only numerical parameters, data
+
+structure layouts and accessors, and small macros and small inline
+
+functions (ten lines or less in length), then the use of the object
+
+file is unrestricted, regardless of whether it is legally a derivative
+
+work.  (Executables containing this object code plus portions of the
+
+Library will still fall under Section 6.)
+
+
+
+  Otherwise, if the work is a derivative of the Library, you may
+
+distribute the object code for the work under the terms of Section 6.
+
+Any executables containing that work also fall under Section 6,
+
+whether or not they are linked directly with the Library itself.
+
+
+
+  6. As an exception to the Sections above, you may also compile or
+
+link a "work that uses the Library" with the Library to produce a
+
+work containing portions of the Library, and distribute that work
+
+under terms of your choice, provided that the terms permit
+
+modification of the work for the customer's own use and reverse
+
+engineering for debugging such modifications.
+
+
+
+  You must give prominent notice with each copy of the work that the
+
+Library is used in it and that the Library and its use are covered by
+
+this License.  You must supply a copy of this License.  If the work
+
+during execution displays copyright notices, you must include the
+
+copyright notice for the Library among them, as well as a reference
+
+directing the user to the copy of this License.  Also, you must do one
+
+of these things:
+
+
+
+    a) Accompany the work with the complete corresponding
+
+    machine-readable source code for the Library including whatever
+
+    changes were used in the work (which must be distributed under
+
+    Sections 1 and 2 above); and, if the work is an executable linked
+
+    with the Library, with the complete machine-readable "work that
+
+    uses the Library", as object code and/or source code, so that the
+
+    user can modify the Library and then relink to produce a modified
+
+    executable containing the modified Library.  (It is understood
+
+    that the user who changes the contents of definitions files in the
+
+    Library will not necessarily be able to recompile the application
+
+    to use the modified definitions.)
+
+
+
+    b) Accompany the work with a written offer, valid for at
+
+    least three years, to give the same user the materials
+
+    specified in Subsection 6a, above, for a charge no more
+
+    than the cost of performing this distribution.
+
+
+
+    c) If distribution of the work is made by offering access to copy
+
+    from a designated place, offer equivalent access to copy the above
+
+    specified materials from the same place.
+
+
+
+    d) Verify that the user has already received a copy of these
+
+    materials or that you have already sent this user a copy.
+
+
+
+  For an executable, the required form of the "work that uses the
+
+Library" must include any data and utility programs needed for
+
+reproducing the executable from it.  However, as a special exception,
+
+the source code distributed need not include anything that is normally
+
+distributed (in either source or binary form) with the major
+
+components (compiler, kernel, and so on) of the operating system on
+
+which the executable runs, unless that component itself accompanies
+
+the executable.
+
+
+
+  It may happen that this requirement contradicts the license
+
+restrictions of other proprietary libraries that do not normally
+
+accompany the operating system.  Such a contradiction means you cannot
+
+use both them and the Library together in an executable that you
+
+distribute.
+
+
+
+  7. You may place library facilities that are a work based on the
+
+Library side-by-side in a single library together with other library
+
+facilities not covered by this License, and distribute such a combined
+
+library, provided that the separate distribution of the work based on
+
+the Library and of the other library facilities is otherwise
+
+permitted, and provided that you do these two things:
+
+
+
+    a) Accompany the combined library with a copy of the same work
+
+    based on the Library, uncombined with any other library
+
+    facilities.  This must be distributed under the terms of the
+
+    Sections above.
+
+
+
+    b) Give prominent notice with the combined library of the fact
+
+    that part of it is a work based on the Library, and explaining
+
+    where to find the accompanying uncombined form of the same work.
+
+
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+
+the Library except as expressly provided under this License.  Any
+
+attempt otherwise to copy, modify, sublicense, link with, or
+
+distribute the Library is void, and will automatically terminate your
+
+rights under this License.  However, parties who have received copies,
+
+or rights, from you under this License will not have their licenses
+
+terminated so long as such parties remain in full compliance.
+
+
+
+  9. You are not required to accept this License, since you have not
+
+signed it.  However, nothing else grants you permission to modify or
+
+distribute the Library or its derivative works.  These actions are
+
+prohibited by law if you do not accept this License.  Therefore, by
+
+modifying or distributing the Library (or any work based on the
+
+Library), you indicate your acceptance of this License to do so, and
+
+all its terms and conditions for copying, distributing or modifying
+
+the Library or works based on it.
+
+
+
+  10. Each time you redistribute the Library (or any work based on the
+
+Library), the recipient automatically receives a license from the
+
+original licensor to copy, distribute, link with or modify the Library
+
+subject to these terms and conditions.  You may not impose any further
+
+restrictions on the recipients' exercise of the rights granted herein.
+
+You are not responsible for enforcing compliance by third parties to
+
+this License.
+
+
+
+  11. If, as a consequence of a court judgment or allegation of patent
+
+infringement or for any other reason (not limited to patent issues),
+
+conditions are imposed on you (whether by court order, agreement or
+
+otherwise) that contradict the conditions of this License, they do not
+
+excuse you from the conditions of this License.  If you cannot
+
+distribute so as to satisfy simultaneously your obligations under this
+
+License and any other pertinent obligations, then as a consequence you
+
+may not distribute the Library at all.  For example, if a patent
+
+license would not permit royalty-free redistribution of the Library by
+
+all those who receive copies directly or indirectly through you, then
+
+the only way you could satisfy both it and this License would be to
+
+refrain entirely from distribution of the Library.
+
+
+
+If any portion of this section is held invalid or unenforceable under any
+
+particular circumstance, the balance of the section is intended to apply,
+
+and the section as a whole is intended to apply in other circumstances.
+
+
+
+It is not the purpose of this section to induce you to infringe any
+
+patents or other property right claims or to contest validity of any
+
+such claims; this section has the sole purpose of protecting the
+
+integrity of the free software distribution system which is
+
+implemented by public license practices.  Many people have made
+
+generous contributions to the wide range of software distributed
+
+through that system in reliance on consistent application of that
+
+system; it is up to the author/donor to decide if he or she is willing
+
+to distribute software through any other system and a licensee cannot
+
+impose that choice.
+
+
+
+This section is intended to make thoroughly clear what is believed to
+
+be a consequence of the rest of this License.
+
+
+
+  12. If the distribution and/or use of the Library is restricted in
+
+certain countries either by patents or by copyrighted interfaces, the
+
+original copyright holder who places the Library under this License may add
+
+an explicit geographical distribution limitation excluding those countries,
+
+so that distribution is permitted only in or among countries not thus
+
+excluded.  In such case, this License incorporates the limitation as if
+
+written in the body of this License.
+
+
+
+  13. The Free Software Foundation may publish revised and/or new
+
+versions of the Library General Public License from time to time.
+
+Such new versions will be similar in spirit to the present version,
+
+but may differ in detail to address new problems or concerns.
+
+
+
+Each version is given a distinguishing version number.  If the Library
+
+specifies a version number of this License which applies to it and
+
+"any later version", you have the option of following the terms and
+
+conditions either of that version or of any later version published by
+
+the Free Software Foundation.  If the Library does not specify a
+
+license version number, you may choose any version ever published by
+
+the Free Software Foundation.
+
+
+
+  14. If you wish to incorporate parts of the Library into other free
+
+programs whose distribution conditions are incompatible with these,
+
+write to the author to ask for permission.  For software which is
+
+copyrighted by the Free Software Foundation, write to the Free
+
+Software Foundation; we sometimes make exceptions for this.  Our
+
+decision will be guided by the two goals of preserving the free status
+
+of all derivatives of our free software and of promoting the sharing
+
+and reuse of software generally.
+
+
+
+			    NO WARRANTY
+
+
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+
+DAMAGES.
+
+
+
+		     END OF TERMS AND CONDITIONS
+
+
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+
+
+  If you develop a new library, and you want it to be of the greatest
+
+possible use to the public, we recommend making it free software that
+
+everyone can redistribute and change.  You can do so by permitting
+
+redistribution under these terms (or, alternatively, under the terms of the
+
+ordinary General Public License).
+
+
+
+  To apply these terms, attach the following notices to the library.  It is
+
+safest to attach them to the start of each source file to most effectively
+
+convey the exclusion of warranty; and each file should have at least the
+
+"copyright" line and a pointer to where the full notice is found.
+
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+
+    Copyright (C) <year>  <name of author>
+
+
+
+    This library is free software; you can redistribute it and/or
+
+    modify it under the terms of the GNU Library General Public
+
+    License as published by the Free Software Foundation; either
+
+    version 2 of the License, or (at your option) any later version.
+
+
+
+    This library is distributed in the hope that it will be useful,
+
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+
+    Library General Public License for more details.
+
+
+
+    You should have received a copy of the GNU Library General Public
+
+    License along with this library; if not, write to the Free
+
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+
+
+You should also get your employer (if you work as a programmer) or your
+
+school, if any, to sign a "copyright disclaimer" for the library, if
+
+necessary.  Here is a sample; alter the names:
+
+
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+
+
+  <signature of Ty Coon>, 1 April 1990
+
+  Ty Coon, President of Vice
+
+
+
+That's all there is to it!
diff --git a/sql-odbc/aws_sdk_cpp_setup.sh b/sql-odbc/aws_sdk_cpp_setup.sh
index d415507933..b75cc01aa7 100755
--- a/sql-odbc/aws_sdk_cpp_setup.sh
+++ b/sql-odbc/aws_sdk_cpp_setup.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 cd src
 git clone -b "1.7.329" "https://github.com/aws/aws-sdk-cpp.git"
 cd ..
diff --git a/sql-odbc/build_mac_debug64.sh b/sql-odbc/build_mac_debug64.sh
index 2c69676ec7..3522137921 100755
--- a/sql-odbc/build_mac_debug64.sh
+++ b/sql-odbc/build_mac_debug64.sh
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # Build AWS SDK
 # $BITNESS=64
 
diff --git a/sql-odbc/build_mac_release64.sh b/sql-odbc/build_mac_release64.sh
index 7b30dd5502..707a0ee53f 100755
--- a/sql-odbc/build_mac_release64.sh
+++ b/sql-odbc/build_mac_release64.sh
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # Build AWS SDK
 # $BITNESS=64
 
diff --git a/sql-odbc/build_win_debug32.ps1 b/sql-odbc/build_win_debug32.ps1
index bb8a128efa..7e23ada173 100644
--- a/sql-odbc/build_win_debug32.ps1
+++ b/sql-odbc/build_win_debug32.ps1
@@ -1,5 +1,2 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $WORKING_DIR = (Get-Location).Path
 .\scripts\build_windows.ps1 $WORKING_DIR Debug 32
diff --git a/sql-odbc/build_win_debug64.ps1 b/sql-odbc/build_win_debug64.ps1
index cdb4635c12..ea7084bada 100644
--- a/sql-odbc/build_win_debug64.ps1
+++ b/sql-odbc/build_win_debug64.ps1
@@ -1,5 +1,2 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $WORKING_DIR = (Get-Location).Path
 .\scripts\build_windows.ps1 $WORKING_DIR Debug 64
diff --git a/sql-odbc/build_win_release32.ps1 b/sql-odbc/build_win_release32.ps1
index ffd79a22b2..4bcf4bd48e 100644
--- a/sql-odbc/build_win_release32.ps1
+++ b/sql-odbc/build_win_release32.ps1
@@ -1,5 +1,2 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $WORKING_DIR = (Get-Location).Path
 .\scripts\build_windows.ps1 $WORKING_DIR Release 32
diff --git a/sql-odbc/build_win_release64.ps1 b/sql-odbc/build_win_release64.ps1
index 626b207fe4..82b1199b33 100644
--- a/sql-odbc/build_win_release64.ps1
+++ b/sql-odbc/build_win_release64.ps1
@@ -1,5 +1,2 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $WORKING_DIR = (Get-Location).Path
 .\scripts\build_windows.ps1 $WORKING_DIR Release 64
diff --git a/sql-odbc/run_cppcheck.bat b/sql-odbc/run_cppcheck.bat
index ab9be0bead..50f076f2ee 100644
--- a/sql-odbc/run_cppcheck.bat
+++ b/sql-odbc/run_cppcheck.bat
@@ -1,6 +1,3 @@
-:: Copyright OpenSearch Contributors
-:: SPDX-License-Identifier: Apache-2.0
-
 :: --force: force checks all define combinations (default max is 12)
 :: --suppress=objectIndex: seemingly false-positive (TODO: investigate this further) 
 :: -iaws-sdk-cpp: avoid checking AWS C++ SDK source files in our repo
diff --git a/sql-odbc/run_cppcheck.sh b/sql-odbc/run_cppcheck.sh
index 586c61b4c7..5a35fc065a 100755
--- a/sql-odbc/run_cppcheck.sh
+++ b/sql-odbc/run_cppcheck.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 RESULTS_FILE=cppcheck-results.log
 
 # --force: force checks all define combinations (default max is 12)
diff --git a/sql-odbc/run_test_runner.bat b/sql-odbc/run_test_runner.bat
index e489fcdec3..8a6b9ab31e 100644
--- a/sql-odbc/run_test_runner.bat
+++ b/sql-odbc/run_test_runner.bat
@@ -1,6 +1,3 @@
-:: Copyright OpenSearch Contributors
-:: SPDX-License-Identifier: Apache-2.0
-
 set PROJECT_DIR=%CD%
 set TEST_RUNNER_DIR=%PROJECT_DIR%\src\TestRunner
 set WORKING_DIR=%PROJECT_DIR%\build\Debug64\odbc\bin\Debug
diff --git a/sql-odbc/run_test_runner.sh b/sql-odbc/run_test_runner.sh
index 80dba39675..49e7f1a399 100755
--- a/sql-odbc/run_test_runner.sh
+++ b/sql-odbc/run_test_runner.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 PROJECT_DIR=$(pwd)
 TEST_RUNNER_DIR=${PROJECT_DIR}/src/TestRunner
 WORKING_DIR=${PROJECT_DIR}/bin64
diff --git a/sql-odbc/scripts/build_aws-sdk-cpp.ps1 b/sql-odbc/scripts/build_aws-sdk-cpp.ps1
index 25e4b02560..32c44a7353 100644
--- a/sql-odbc/scripts/build_aws-sdk-cpp.ps1
+++ b/sql-odbc/scripts/build_aws-sdk-cpp.ps1
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $CONFIGURATION = $args[0]
 $WIN_ARCH = $args[1]
 $SRC_DIR = $args[2]
diff --git a/sql-odbc/scripts/build_driver.ps1 b/sql-odbc/scripts/build_driver.ps1
index 90a0bf6fab..1c0f8a799c 100644
--- a/sql-odbc/scripts/build_driver.ps1
+++ b/sql-odbc/scripts/build_driver.ps1
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $CONFIGURATION = $args[0]
 $WIN_ARCH = $args[1]
 $SRC_DIR = $args[2]
@@ -15,4 +12,4 @@ cmake -S $SRC_DIR `
     -D BUILD_WITH_TESTS=ON
 
 # # Build Project
-cmake --build $BUILD_DIR --config $CONFIGURATION --parallel 4 
+cmake --build $BUILD_DIR --config $CONFIGURATION --parallel 4
diff --git a/sql-odbc/scripts/build_installer.ps1 b/sql-odbc/scripts/build_installer.ps1
index 1516e244d9..b6a8e6edc0 100644
--- a/sql-odbc/scripts/build_installer.ps1
+++ b/sql-odbc/scripts/build_installer.ps1
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $CONFIGURATION = $args[0]
 $WIN_ARCH = $args[1]
 $SRC_DIR = $args[2]
@@ -17,4 +14,4 @@ cmake -S $SRC_DIR `
     -D BUILD_WITH_TESTS=OFF
 
 # # Build Project
-msbuild $BUILD_DIR\PACKAGE.vcxproj -m -p:Configuration=Release 
+msbuild $BUILD_DIR\PACKAGE.vcxproj -m -p:Configuration=Release
diff --git a/sql-odbc/scripts/build_windows.ps1 b/sql-odbc/scripts/build_windows.ps1
index 27d8c7c068..41ef150424 100644
--- a/sql-odbc/scripts/build_windows.ps1
+++ b/sql-odbc/scripts/build_windows.ps1
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # Build AWS SDK
 $CURRENT_DIR = Get-Location
 $WORKING_DIR = $args[0]
diff --git a/sql-odbc/scripts/prepare_ci_output.ps1 b/sql-odbc/scripts/prepare_ci_output.ps1
index 6d48c79ec0..1deafab581 100644
--- a/sql-odbc/scripts/prepare_ci_output.ps1
+++ b/sql-odbc/scripts/prepare_ci_output.ps1
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 $ODBC_BIN_PATH = $args[0]
 $ODBC_LIB_PATH = $args[1]
 $ODBC_BUILD_PATH = $args[2]
diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
index 5641abe41d..265ce71aa9 100644
--- a/sql-odbc/src/CMakeLists.txt
+++ b/sql-odbc/src/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # Pre 3.16 versions of Windows set MD/MT incorrectly and cause linker 'warnings' which are actually serious issues
 if(WIN32)
 cmake_minimum_required(VERSION 3.16) 
diff --git a/sql-odbc/src/DSNInstaller/CMakeLists.txt b/sql-odbc/src/DSNInstaller/CMakeLists.txt
index 35a19502fd..de7a304fbc 100644
--- a/sql-odbc/src/DSNInstaller/CMakeLists.txt
+++ b/sql-odbc/src/DSNInstaller/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(dsn_installer)
 
 set(SOURCE_FILES dsn_installer.cpp)
diff --git a/sql-odbc/src/DSNInstaller/dsn_installer.cpp b/sql-odbc/src/DSNInstaller/dsn_installer.cpp
index b1d9eb837d..94bb4a7327 100644
--- a/sql-odbc/src/DSNInstaller/dsn_installer.cpp
+++ b/sql-odbc/src/DSNInstaller/dsn_installer.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include <sql.h>
 #include <sqlext.h>
diff --git a/sql-odbc/src/IntegrationTests/CMakeLists.txt b/sql-odbc/src/IntegrationTests/CMakeLists.txt
index 13846424da..bc2dc38872 100644
--- a/sql-odbc/src/IntegrationTests/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(integration_tests)
 
 set(HELPER_ITEST "${CMAKE_CURRENT_SOURCE_DIR}/ITODBCHelper")
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
index 93a2a71633..760ae5d732 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_aws_auth)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h
index 029f8d4ad8..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
- 
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
index c36da943d1..d714a19b39 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "it_odbc_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
index 2d3fd2090c..657f32bf6c 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_catalog)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
index f35006ffef..78ae621f66 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #define NOMINMAX 1
 #include "pch.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
index ef49d0ef9b..d336a9b304 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_connection)
 
 # Source, headers, and include dirs
@@ -17,4 +14,3 @@ add_executable(itodbc_connection ${SOURCE_FILES})
 target_code_coverage(itodbc_connection PUBLIC AUTO ALL)
 target_link_libraries(itodbc_connection sqlodbc itodbc_helper ut_helper gtest_main)
 target_compile_definitions(itodbc_connection PUBLIC _UNICODE UNICODE)
-
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
index 30aaaedffe..8ea514a725 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc_connection.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
index 126b0f45ae..37e6d116df 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_descriptors)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp
index 320e70f906..968690025e 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCDescriptors/test_odbc_descriptors.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
index 7d0bb5010e..4fa5d5e187 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_execution)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp b/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp
index cbcd53017e..5c45b095e2 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCExecution/test_odbc_execution.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
index 70acd092b5..56f0bc2cd8 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCHelper/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_helper)
 
 # Source, headers, and include dirs
@@ -17,4 +14,4 @@ add_library(itodbc_helper SHARED ${SOURCE_FILES} ${HEADER_FILES})
 
 # Library dependencies
 target_link_libraries(itodbc_helper sqlodbc ut_helper gtest_main)
-target_compile_definitions(itodbc_helper PUBLIC _UNICODE UNICODE)	
+target_compile_definitions(itodbc_helper PUBLIC _UNICODE UNICODE)
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp
index 4bcde4be5e..5344962ff2 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "it_odbc_helper.h"
 
 #include <codecvt>
diff --git a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h
index 04edf28bdd..8a911d5a28 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCHelper/it_odbc_helper.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef IT_ODBC_HELPER_H
 #define IT_ODBC_HELPER_H
 
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
index 855ff9bf71..9b9698650f 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_info)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp
index 69b3b4a48a..822434bb4d 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt
index 71a64ee60f..7adfd4d13f 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_pagination)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp b/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp
index a750655b1f..3e3d605813 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCPagination/test_odbc_pagination.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt
index 62cbac21e5..1107fbf4f9 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCResults/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_results)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCResults/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp b/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp
index 35c9a548b2..7d0b9b6c05 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCResults/test_odbc_results.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt
index 2155d8005f..74f8c6d509 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt
+++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(itodbc_tableau_queries)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h
+++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp
index 66ac70cab5..2da07197a7 100644
--- a/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp
+++ b/sql-odbc/src/IntegrationTests/ITODBCTableauQueries/test_odbc_tableau_queries.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/PerformanceTests/CMakeLists.txt b/sql-odbc/src/PerformanceTests/CMakeLists.txt
index 4bad9830a1..f27eb1781b 100644
--- a/sql-odbc/src/PerformanceTests/CMakeLists.txt
+++ b/sql-odbc/src/PerformanceTests/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(performance_tests)
 
 set(RESULTS_PTESTS "${CMAKE_CURRENT_SOURCE_DIR}/PTODBCResults")
@@ -11,4 +8,3 @@ set(EXECUTION_PTESTS "${CMAKE_CURRENT_SOURCE_DIR}/PTODBCExecution")
 add_subdirectory(${RESULTS_PTESTS})
 add_subdirectory(${INFO_PTESTS})
 add_subdirectory(${EXECUTION_PTESTS})
-
diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt
index 7556abfd70..7ee23c0802 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt
+++ b/sql-odbc/src/PerformanceTests/PTODBCExecution/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(performance_execution)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp b/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp
index 8115d5d6aa..60433068e4 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp
+++ b/sql-odbc/src/PerformanceTests/PTODBCExecution/performance_odbc_execution.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "chrono"
 #include <opensearch_odbc.h>
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt
index bfc87f0df5..71550382ac 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt
+++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(performance_info)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp
+++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h
+++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp b/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp
index 76c54d6c54..9ee6e96379 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp
+++ b/sql-odbc/src/PerformanceTests/PTODBCInfo/performance_odbc_info.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "opensearch_communication.h"
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt
index 4cfb4d92ad..e04f6b736e 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt
+++ b/sql-odbc/src/PerformanceTests/PTODBCResults/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(performance_results)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp
+++ b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h
+++ b/sql-odbc/src/PerformanceTests/PTODBCResults/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp b/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp
index 434a2e5157..ed116d0d11 100644
--- a/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp
+++ b/sql-odbc/src/PerformanceTests/PTODBCResults/performance_odbc_results.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/TestRunner/mako_template.html b/sql-odbc/src/TestRunner/mako_template.html
index 408b3a4a18..2f4078ebcb 100644
--- a/sql-odbc/src/TestRunner/mako_template.html
+++ b/sql-odbc/src/TestRunner/mako_template.html
@@ -1,7 +1,3 @@
-<!--
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
--->
 <!-- clang-format off -->
 
 <!DOCTYPE html>
diff --git a/sql-odbc/src/TestRunner/test_runner.py b/sql-odbc/src/TestRunner/test_runner.py
index 89d7eacd00..ad2c4d9014 100644
--- a/sql-odbc/src/TestRunner/test_runner.py
+++ b/sql-odbc/src/TestRunner/test_runner.py
@@ -1,8 +1,3 @@
-"""
-Copyright OpenSearch Contributors
-SPDX-License-Identifier: Apache-2.0
-"""
-
 import os
 import subprocess
 import json
diff --git a/sql-odbc/src/UnitTests/CMakeLists.txt b/sql-odbc/src/UnitTests/CMakeLists.txt
index f8b180f6c6..825c0c1770 100644
--- a/sql-odbc/src/UnitTests/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(unit_tests)
 
 set(HELPER_UTEST "${CMAKE_CURRENT_SOURCE_DIR}/UTHelper")
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt b/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt
index 5a2a2ae41e..97d7df09fb 100644
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/UTAwsSdkCpp/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(ut_aws_sdk_cpp)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp
+++ b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h
+++ b/sql-odbc/src/UnitTests/UTAwsSdkCpp/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp b/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp
index 04b774c1a6..4952c70fc2 100644
--- a/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp
+++ b/sql-odbc/src/UnitTests/UTAwsSdkCpp/test_aws_sdk_cpp.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #ifdef __APPLE__
diff --git a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt b/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt
index 566f22eddd..5d985af2cc 100644
--- a/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/UTConn/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(ut_conn)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/UnitTests/UTConn/pch.cpp b/sql-odbc/src/UnitTests/UTConn/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/UnitTests/UTConn/pch.cpp
+++ b/sql-odbc/src/UnitTests/UTConn/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/UnitTests/UTConn/pch.h b/sql-odbc/src/UnitTests/UTConn/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/UnitTests/UTConn/pch.h
+++ b/sql-odbc/src/UnitTests/UTConn/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/UnitTests/UTConn/test_conn.cpp b/sql-odbc/src/UnitTests/UTConn/test_conn.cpp
index 893b4ed9e0..a93962a0f7 100644
--- a/sql-odbc/src/UnitTests/UTConn/test_conn.cpp
+++ b/sql-odbc/src/UnitTests/UTConn/test_conn.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp b/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp
index 4368cd969f..f3899123dd 100644
--- a/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp
+++ b/sql-odbc/src/UnitTests/UTConn/test_query_execution.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #include "unit_test_helper.h"
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt b/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt
index db2dc79c1e..43526f0ec1 100644
--- a/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/UTCriticalSection/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(ut_critical_section)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp b/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp
+++ b/sql-odbc/src/UnitTests/UTCriticalSection/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/pch.h b/sql-odbc/src/UnitTests/UTCriticalSection/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/UnitTests/UTCriticalSection/pch.h
+++ b/sql-odbc/src/UnitTests/UTCriticalSection/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp b/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp
index 7cc6c84b39..31a3f7ea2b 100644
--- a/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp
+++ b/sql-odbc/src/UnitTests/UTCriticalSection/test_critical_section.cpp
@@ -1,8 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 #include <stdio.h>
 
 #include <iostream>
diff --git a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt b/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt
index 9a6f4d26a4..f9764d31cb 100644
--- a/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/UTHelper/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(ut_helper)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp
index 6d8cae47cc..9f8fbd7508 100644
--- a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp
+++ b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "unit_test_helper.h"
 
 #include <fstream>
diff --git a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h
index 6ee2cd4027..fcdbfa95b2 100644
--- a/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h
+++ b/sql-odbc/src/UnitTests/UTHelper/unit_test_helper.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef UNIT_TEST_HELPER
 #define UNIT_TEST_HELPER
 
diff --git a/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt b/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt
index 0b02235773..a5fec96f5e 100644
--- a/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt
+++ b/sql-odbc/src/UnitTests/UTRabbit/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(ut_rabbit)
 
 # Source, headers, and include dirs
diff --git a/sql-odbc/src/UnitTests/UTRabbit/pch.cpp b/sql-odbc/src/UnitTests/UTRabbit/pch.cpp
index 1baf380b96..97b544ec11 100644
--- a/sql-odbc/src/UnitTests/UTRabbit/pch.cpp
+++ b/sql-odbc/src/UnitTests/UTRabbit/pch.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.cpp
 // Include the standard header and generate the precompiled header.
diff --git a/sql-odbc/src/UnitTests/UTRabbit/pch.h b/sql-odbc/src/UnitTests/UTRabbit/pch.h
index 55f4a77132..29c81fffa1 100644
--- a/sql-odbc/src/UnitTests/UTRabbit/pch.h
+++ b/sql-odbc/src/UnitTests/UTRabbit/pch.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 //
 // pch.h
 // Header for standard system include files.
diff --git a/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp b/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp
index a5e885570f..84f53605a7 100644
--- a/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp
+++ b/sql-odbc/src/UnitTests/UTRabbit/test_rabbit.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "pch.h"
 #ifdef __APPLE__
diff --git a/sql-odbc/src/gtest/googletest-download.cmake b/sql-odbc/src/gtest/googletest-download.cmake
index 3a5ad748e6..0ec4d55866 100644
--- a/sql-odbc/src/gtest/googletest-download.cmake
+++ b/sql-odbc/src/gtest/googletest-download.cmake
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # code copied from https://crascit.com/2015/07/25/cmake-gtest/
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
diff --git a/sql-odbc/src/gtest/googletest.cmake b/sql-odbc/src/gtest/googletest.cmake
index c841afb18e..5ca7090877 100644
--- a/sql-odbc/src/gtest/googletest.cmake
+++ b/sql-odbc/src/gtest/googletest.cmake
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 # the following code to fetch googletest
 # is inspired by and adapted after https://crascit.com/2015/07/25/cmake-gtest/
 # download and unpack googletest at configure time
diff --git a/sql-odbc/src/installer/CMakeLists.txt b/sql-odbc/src/installer/CMakeLists.txt
index 5b984f705c..2b559109dd 100644
--- a/sql-odbc/src/installer/CMakeLists.txt
+++ b/sql-odbc/src/installer/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 include(InstallRequiredSystemLibraries)
 include(CPackComponent)
 
@@ -35,8 +32,7 @@ if(WIN32)
     # This XML file is used for registry setup
     set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/patch.xml")
 
-    # CPack doesn't allow extensionless licenses, need to make a copy with an extension, .txt is appropriate
-    configure_file("${PROJECT_ROOT}/LICENSE" "${PROJECT_ROOT}/LICENSE.txt" COPYONLY)
+    # Add license file
     set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_ROOT}/LICENSE.txt")
 else()
     set(CPACK_GENERATOR "productbuild")
@@ -57,8 +53,7 @@ else()
     set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_ALIGNMENT "bottomleft")
     set(CPACK_PRODUCTBUILD_BACKGROUND_DARKAQUA_SCALING "none")
 
-    # CPack doesn't allow extensionless licenses, need to make a copy with an extension, .txt is appropriate
-    configure_file("${PROJECT_ROOT}/LICENSE" "${PROJECT_ROOT}/LICENSE.txt" COPYONLY)
+    # Add license file
     set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_ROOT}/LICENSE.txt")
     set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/Resources/README.txt")
     set(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/Resources/Welcome.txt")
@@ -89,7 +84,7 @@ install(TARGETS sqlodbc DESTINATION bin COMPONENT "Driver")
 
 # Install documentation files
 install(FILES "${PROJECT_ROOT}/README.md" DESTINATION doc COMPONENT "Docs")
-install(FILES "${PROJECT_ROOT}/LICENSE" DESTINATION doc COMPONENT "Docs")
+install(FILES "${PROJECT_ROOT}/LICENSE.txt" DESTINATION doc COMPONENT "Docs")
 install(FILES "${PROJECT_ROOT}/THIRD-PARTY" DESTINATION doc COMPONENT "Docs")
 
 # Install resource files
diff --git a/sql-odbc/src/installer/postinstall b/sql-odbc/src/installer/postinstall
index 8fa028b898..c95783c053 100644
--- a/sql-odbc/src/installer/postinstall
+++ b/sql-odbc/src/installer/postinstall
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 PKG_INSTALL_DIR=/Applications
 FINAL_INSTALL_DIR=/Library/ODBC/opensearch-sql-odbc
 
diff --git a/sql-odbc/src/installer/remove-opensearch-dsn.sh b/sql-odbc/src/installer/remove-opensearch-dsn.sh
index 97d5ca8d8c..ecf7121f5f 100644
--- a/sql-odbc/src/installer/remove-opensearch-dsn.sh
+++ b/sql-odbc/src/installer/remove-opensearch-dsn.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 echo "This script will only remove the default DSN and Driver entries from your ODBC configuration."
 echo "You will be responsible for removing installed files from the system."
 if [[ $EUID -ne 0 ]]; then
diff --git a/sql-odbc/src/modules/code-coverage.cmake b/sql-odbc/src/modules/code-coverage.cmake
index 57185f4320..0d24190c5d 100644
--- a/sql-odbc/src/modules/code-coverage.cmake
+++ b/sql-odbc/src/modules/code-coverage.cmake
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 #
 # Copyright (C) 2018-2020 by George Cave - gcave@stablecoder.ca
 #
diff --git a/sql-odbc/src/opensearchenlist/CMakeLists.txt b/sql-odbc/src/opensearchenlist/CMakeLists.txt
index f1b26bf32a..6e4c00524d 100644
--- a/sql-odbc/src/opensearchenlist/CMakeLists.txt
+++ b/sql-odbc/src/opensearchenlist/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(opensearchenlist)
 
 # Source files for opensearchenlist
diff --git a/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp b/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp
index 48ffdb6ad5..f427d837ad 100644
--- a/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp
+++ b/sql-odbc/src/opensearchenlist/msdtc_enlist.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifdef _HANDLE_ENLIST_IN_DTC_
 
 #undef _MEMORY_DEBUG_
diff --git a/sql-odbc/src/opensearchenlist/opensearch_enlist.h b/sql-odbc/src/opensearchenlist/opensearch_enlist.h
index f81d3dc60f..a87d402bd6 100644
--- a/sql-odbc/src/opensearchenlist/opensearch_enlist.h
+++ b/sql-odbc/src/opensearchenlist/opensearch_enlist.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCH_ENLIST_H__
 #define __OPENSEARCH_ENLIST_H__
 
diff --git a/sql-odbc/src/sqlodbc/CMakeLists.txt b/sql-odbc/src/sqlodbc/CMakeLists.txt
index 90237d7df0..f926dfe644 100644
--- a/sql-odbc/src/sqlodbc/CMakeLists.txt
+++ b/sql-odbc/src/sqlodbc/CMakeLists.txt
@@ -1,6 +1,3 @@
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
-
 project(sqlodbc)
 
 # Source files for sqlodbc
diff --git a/sql-odbc/src/sqlodbc/LICENSE.txt b/sql-odbc/src/sqlodbc/LICENSE.txt
new file mode 100644
index 0000000000..f2ff00e7d8
--- /dev/null
+++ b/sql-odbc/src/sqlodbc/LICENSE.txt
@@ -0,0 +1,961 @@
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+
+		       Version 2, June 1991
+
+
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+
+                    675 Mass Ave, Cambridge, MA 02139, USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+
+ of this license document, but changing it is not allowed.
+
+
+
+[This is the first released version of the library GPL.  It is
+
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+
+
+			    Preamble
+
+
+
+  The licenses for most software are designed to take away your
+
+freedom to share and change it.  By contrast, the GNU General Public
+
+Licenses are intended to guarantee your freedom to share and change
+
+free software--to make sure the software is free for all its users.
+
+
+
+  This license, the Library General Public License, applies to some
+
+specially designated Free Software Foundation software, and to any
+
+other libraries whose authors decide to use it.  You can use it for
+
+your libraries, too.
+
+
+
+  When we speak of free software, we are referring to freedom, not
+
+price.  Our General Public Licenses are designed to make sure that you
+
+have the freedom to distribute copies of free software (and charge for
+
+this service if you wish), that you receive source code or can get it
+
+if you want it, that you can change the software or use pieces of it
+
+in new free programs; and that you know you can do these things.
+
+
+
+  To protect your rights, we need to make restrictions that forbid
+
+anyone to deny you these rights or to ask you to surrender the rights.
+
+These restrictions translate to certain responsibilities for you if
+
+you distribute copies of the library, or if you modify it.
+
+
+
+  For example, if you distribute copies of the library, whether gratis
+
+or for a fee, you must give the recipients all the rights that we gave
+
+you.  You must make sure that they, too, receive or can get the source
+
+code.  If you link a program with the library, you must provide
+
+complete object files to the recipients so that they can relink them
+
+with the library, after making changes to the library and recompiling
+
+it.  And you must show them these terms so they know their rights.
+
+
+
+  Our method of protecting your rights has two steps: (1) copyright
+
+the library, and (2) offer you this license which gives you legal
+
+permission to copy, distribute and/or modify the library.
+
+
+
+  Also, for each distributor's protection, we want to make certain
+
+that everyone understands that there is no warranty for this free
+
+library.  If the library is modified by someone else and passed on, we
+
+want its recipients to know that what they have is not the original
+
+version, so that any problems introduced by others will not reflect on
+
+the original authors' reputations.
+
+
+
+  Finally, any free program is threatened constantly by software
+
+patents.  We wish to avoid the danger that companies distributing free
+
+software will individually obtain patent licenses, thus in effect
+
+transforming the program into proprietary software.  To prevent this,
+
+we have made it clear that any patent must be licensed for everyone's
+
+free use or not licensed at all.
+
+
+
+  Most GNU software, including some libraries, is covered by the ordinary
+
+GNU General Public License, which was designed for utility programs.  This
+
+license, the GNU Library General Public License, applies to certain
+
+designated libraries.  This license is quite different from the ordinary
+
+one; be sure to read it in full, and don't assume that anything in it is
+
+the same as in the ordinary license.
+
+
+
+  The reason we have a separate public license for some libraries is that
+
+they blur the distinction we usually make between modifying or adding to a
+
+program and simply using it.  Linking a program with a library, without
+
+changing the library, is in some sense simply using the library, and is
+
+analogous to running a utility program or application program.  However, in
+
+a textual and legal sense, the linked executable is a combined work, a
+
+derivative of the original library, and the ordinary General Public License
+
+treats it as such.
+
+
+
+  Because of this blurred distinction, using the ordinary General
+
+Public License for libraries did not effectively promote software
+
+sharing, because most developers did not use the libraries.  We
+
+concluded that weaker conditions might promote sharing better.
+
+
+
+  However, unrestricted linking of non-free programs would deprive the
+
+users of those programs of all benefit from the free status of the
+
+libraries themselves.  This Library General Public License is intended to
+
+permit developers of non-free programs to use free libraries, while
+
+preserving your freedom as a user of such programs to change the free
+
+libraries that are incorporated in them.  (We have not seen how to achieve
+
+this as regards changes in header files, but we have achieved it as regards
+
+changes in the actual functions of the Library.)  The hope is that this
+
+will lead to faster development of free libraries.
+
+
+
+  The precise terms and conditions for copying, distribution and
+
+modification follow.  Pay close attention to the difference between a
+
+"work based on the library" and a "work that uses the library".  The
+
+former contains code derived from the library, while the latter only
+
+works together with the library.
+
+
+
+  Note that it is possible for a library to be covered by the ordinary
+
+General Public License rather than by this special one.
+
+
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+
+  0. This License Agreement applies to any software library which
+
+contains a notice placed by the copyright holder or other authorized
+
+party saying it may be distributed under the terms of this Library
+
+General Public License (also called "this License").  Each licensee is
+
+addressed as "you".
+
+
+
+  A "library" means a collection of software functions and/or data
+
+prepared so as to be conveniently linked with application programs
+
+(which use some of those functions and data) to form executables.
+
+
+
+  The "Library", below, refers to any such software library or work
+
+which has been distributed under these terms.  A "work based on the
+
+Library" means either the Library or any derivative work under
+
+copyright law: that is to say, a work containing the Library or a
+
+portion of it, either verbatim or with modifications and/or translated
+
+straightforwardly into another language.  (Hereinafter, translation is
+
+included without limitation in the term "modification".)
+
+
+
+  "Source code" for a work means the preferred form of the work for
+
+making modifications to it.  For a library, complete source code means
+
+all the source code for all modules it contains, plus any associated
+
+interface definition files, plus the scripts used to control compilation
+
+and installation of the library.
+
+
+
+  Activities other than copying, distribution and modification are not
+
+covered by this License; they are outside its scope.  The act of
+
+running a program using the Library is not restricted, and output from
+
+such a program is covered only if its contents constitute a work based
+
+on the Library (independent of the use of the Library in a tool for
+
+writing it).  Whether that is true depends on what the Library does
+
+and what the program that uses the Library does.
+
+
+
+  1. You may copy and distribute verbatim copies of the Library's
+
+complete source code as you receive it, in any medium, provided that
+
+you conspicuously and appropriately publish on each copy an
+
+appropriate copyright notice and disclaimer of warranty; keep intact
+
+all the notices that refer to this License and to the absence of any
+
+warranty; and distribute a copy of this License along with the
+
+Library.
+
+
+
+  You may charge a fee for the physical act of transferring a copy,
+
+and you may at your option offer warranty protection in exchange for a
+
+fee.
+
+
+
+  2. You may modify your copy or copies of the Library or any portion
+
+of it, thus forming a work based on the Library, and copy and
+
+distribute such modifications or work under the terms of Section 1
+
+above, provided that you also meet all of these conditions:
+
+
+
+    a) The modified work must itself be a software library.
+
+
+
+    b) You must cause the files modified to carry prominent notices
+
+    stating that you changed the files and the date of any change.
+
+
+
+    c) You must cause the whole of the work to be licensed at no
+
+    charge to all third parties under the terms of this License.
+
+
+
+    d) If a facility in the modified Library refers to a function or a
+
+    table of data to be supplied by an application program that uses
+
+    the facility, other than as an argument passed when the facility
+
+    is invoked, then you must make a good faith effort to ensure that,
+
+    in the event an application does not supply such function or
+
+    table, the facility still operates, and performs whatever part of
+
+    its purpose remains meaningful.
+
+
+
+    (For example, a function in a library to compute square roots has
+
+    a purpose that is entirely well-defined independent of the
+
+    application.  Therefore, Subsection 2d requires that any
+
+    application-supplied function or table used by this function must
+
+    be optional: if the application does not supply it, the square
+
+    root function must still compute square roots.)
+
+
+
+These requirements apply to the modified work as a whole.  If
+
+identifiable sections of that work are not derived from the Library,
+
+and can be reasonably considered independent and separate works in
+
+themselves, then this License, and its terms, do not apply to those
+
+sections when you distribute them as separate works.  But when you
+
+distribute the same sections as part of a whole which is a work based
+
+on the Library, the distribution of the whole must be on the terms of
+
+this License, whose permissions for other licensees extend to the
+
+entire whole, and thus to each and every part regardless of who wrote
+
+it.
+
+
+
+Thus, it is not the intent of this section to claim rights or contest
+
+your rights to work written entirely by you; rather, the intent is to
+
+exercise the right to control the distribution of derivative or
+
+collective works based on the Library.
+
+
+
+In addition, mere aggregation of another work not based on the Library
+
+with the Library (or with a work based on the Library) on a volume of
+
+a storage or distribution medium does not bring the other work under
+
+the scope of this License.
+
+
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+
+License instead of this License to a given copy of the Library.  To do
+
+this, you must alter all the notices that refer to this License, so
+
+that they refer to the ordinary GNU General Public License, version 2,
+
+instead of to this License.  (If a newer version than version 2 of the
+
+ordinary GNU General Public License has appeared, then you can specify
+
+that version instead if you wish.)  Do not make any other change in
+
+these notices.
+
+
+
+  Once this change is made in a given copy, it is irreversible for
+
+that copy, so the ordinary GNU General Public License applies to all
+
+subsequent copies and derivative works made from that copy.
+
+
+
+  This option is useful when you wish to copy part of the code of
+
+the Library into a program that is not a library.
+
+
+
+  4. You may copy and distribute the Library (or a portion or
+
+derivative of it, under Section 2) in object code or executable form
+
+under the terms of Sections 1 and 2 above provided that you accompany
+
+it with the complete corresponding machine-readable source code, which
+
+must be distributed under the terms of Sections 1 and 2 above on a
+
+medium customarily used for software interchange.
+
+
+
+  If distribution of object code is made by offering access to copy
+
+from a designated place, then offering equivalent access to copy the
+
+source code from the same place satisfies the requirement to
+
+distribute the source code, even though third parties are not
+
+compelled to copy the source along with the object code.
+
+
+
+  5. A program that contains no derivative of any portion of the
+
+Library, but is designed to work with the Library by being compiled or
+
+linked with it, is called a "work that uses the Library".  Such a
+
+work, in isolation, is not a derivative work of the Library, and
+
+therefore falls outside the scope of this License.
+
+
+
+  However, linking a "work that uses the Library" with the Library
+
+creates an executable that is a derivative of the Library (because it
+
+contains portions of the Library), rather than a "work that uses the
+
+library".  The executable is therefore covered by this License.
+
+Section 6 states terms for distribution of such executables.
+
+
+
+  When a "work that uses the Library" uses material from a header file
+
+that is part of the Library, the object code for the work may be a
+
+derivative work of the Library even though the source code is not.
+
+Whether this is true is especially significant if the work can be
+
+linked without the Library, or if the work is itself a library.  The
+
+threshold for this to be true is not precisely defined by law.
+
+
+
+  If such an object file uses only numerical parameters, data
+
+structure layouts and accessors, and small macros and small inline
+
+functions (ten lines or less in length), then the use of the object
+
+file is unrestricted, regardless of whether it is legally a derivative
+
+work.  (Executables containing this object code plus portions of the
+
+Library will still fall under Section 6.)
+
+
+
+  Otherwise, if the work is a derivative of the Library, you may
+
+distribute the object code for the work under the terms of Section 6.
+
+Any executables containing that work also fall under Section 6,
+
+whether or not they are linked directly with the Library itself.
+
+
+
+  6. As an exception to the Sections above, you may also compile or
+
+link a "work that uses the Library" with the Library to produce a
+
+work containing portions of the Library, and distribute that work
+
+under terms of your choice, provided that the terms permit
+
+modification of the work for the customer's own use and reverse
+
+engineering for debugging such modifications.
+
+
+
+  You must give prominent notice with each copy of the work that the
+
+Library is used in it and that the Library and its use are covered by
+
+this License.  You must supply a copy of this License.  If the work
+
+during execution displays copyright notices, you must include the
+
+copyright notice for the Library among them, as well as a reference
+
+directing the user to the copy of this License.  Also, you must do one
+
+of these things:
+
+
+
+    a) Accompany the work with the complete corresponding
+
+    machine-readable source code for the Library including whatever
+
+    changes were used in the work (which must be distributed under
+
+    Sections 1 and 2 above); and, if the work is an executable linked
+
+    with the Library, with the complete machine-readable "work that
+
+    uses the Library", as object code and/or source code, so that the
+
+    user can modify the Library and then relink to produce a modified
+
+    executable containing the modified Library.  (It is understood
+
+    that the user who changes the contents of definitions files in the
+
+    Library will not necessarily be able to recompile the application
+
+    to use the modified definitions.)
+
+
+
+    b) Accompany the work with a written offer, valid for at
+
+    least three years, to give the same user the materials
+
+    specified in Subsection 6a, above, for a charge no more
+
+    than the cost of performing this distribution.
+
+
+
+    c) If distribution of the work is made by offering access to copy
+
+    from a designated place, offer equivalent access to copy the above
+
+    specified materials from the same place.
+
+
+
+    d) Verify that the user has already received a copy of these
+
+    materials or that you have already sent this user a copy.
+
+
+
+  For an executable, the required form of the "work that uses the
+
+Library" must include any data and utility programs needed for
+
+reproducing the executable from it.  However, as a special exception,
+
+the source code distributed need not include anything that is normally
+
+distributed (in either source or binary form) with the major
+
+components (compiler, kernel, and so on) of the operating system on
+
+which the executable runs, unless that component itself accompanies
+
+the executable.
+
+
+
+  It may happen that this requirement contradicts the license
+
+restrictions of other proprietary libraries that do not normally
+
+accompany the operating system.  Such a contradiction means you cannot
+
+use both them and the Library together in an executable that you
+
+distribute.
+
+
+
+  7. You may place library facilities that are a work based on the
+
+Library side-by-side in a single library together with other library
+
+facilities not covered by this License, and distribute such a combined
+
+library, provided that the separate distribution of the work based on
+
+the Library and of the other library facilities is otherwise
+
+permitted, and provided that you do these two things:
+
+
+
+    a) Accompany the combined library with a copy of the same work
+
+    based on the Library, uncombined with any other library
+
+    facilities.  This must be distributed under the terms of the
+
+    Sections above.
+
+
+
+    b) Give prominent notice with the combined library of the fact
+
+    that part of it is a work based on the Library, and explaining
+
+    where to find the accompanying uncombined form of the same work.
+
+
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+
+the Library except as expressly provided under this License.  Any
+
+attempt otherwise to copy, modify, sublicense, link with, or
+
+distribute the Library is void, and will automatically terminate your
+
+rights under this License.  However, parties who have received copies,
+
+or rights, from you under this License will not have their licenses
+
+terminated so long as such parties remain in full compliance.
+
+
+
+  9. You are not required to accept this License, since you have not
+
+signed it.  However, nothing else grants you permission to modify or
+
+distribute the Library or its derivative works.  These actions are
+
+prohibited by law if you do not accept this License.  Therefore, by
+
+modifying or distributing the Library (or any work based on the
+
+Library), you indicate your acceptance of this License to do so, and
+
+all its terms and conditions for copying, distributing or modifying
+
+the Library or works based on it.
+
+
+
+  10. Each time you redistribute the Library (or any work based on the
+
+Library), the recipient automatically receives a license from the
+
+original licensor to copy, distribute, link with or modify the Library
+
+subject to these terms and conditions.  You may not impose any further
+
+restrictions on the recipients' exercise of the rights granted herein.
+
+You are not responsible for enforcing compliance by third parties to
+
+this License.
+
+
+
+  11. If, as a consequence of a court judgment or allegation of patent
+
+infringement or for any other reason (not limited to patent issues),
+
+conditions are imposed on you (whether by court order, agreement or
+
+otherwise) that contradict the conditions of this License, they do not
+
+excuse you from the conditions of this License.  If you cannot
+
+distribute so as to satisfy simultaneously your obligations under this
+
+License and any other pertinent obligations, then as a consequence you
+
+may not distribute the Library at all.  For example, if a patent
+
+license would not permit royalty-free redistribution of the Library by
+
+all those who receive copies directly or indirectly through you, then
+
+the only way you could satisfy both it and this License would be to
+
+refrain entirely from distribution of the Library.
+
+
+
+If any portion of this section is held invalid or unenforceable under any
+
+particular circumstance, the balance of the section is intended to apply,
+
+and the section as a whole is intended to apply in other circumstances.
+
+
+
+It is not the purpose of this section to induce you to infringe any
+
+patents or other property right claims or to contest validity of any
+
+such claims; this section has the sole purpose of protecting the
+
+integrity of the free software distribution system which is
+
+implemented by public license practices.  Many people have made
+
+generous contributions to the wide range of software distributed
+
+through that system in reliance on consistent application of that
+
+system; it is up to the author/donor to decide if he or she is willing
+
+to distribute software through any other system and a licensee cannot
+
+impose that choice.
+
+
+
+This section is intended to make thoroughly clear what is believed to
+
+be a consequence of the rest of this License.
+
+
+
+  12. If the distribution and/or use of the Library is restricted in
+
+certain countries either by patents or by copyrighted interfaces, the
+
+original copyright holder who places the Library under this License may add
+
+an explicit geographical distribution limitation excluding those countries,
+
+so that distribution is permitted only in or among countries not thus
+
+excluded.  In such case, this License incorporates the limitation as if
+
+written in the body of this License.
+
+
+
+  13. The Free Software Foundation may publish revised and/or new
+
+versions of the Library General Public License from time to time.
+
+Such new versions will be similar in spirit to the present version,
+
+but may differ in detail to address new problems or concerns.
+
+
+
+Each version is given a distinguishing version number.  If the Library
+
+specifies a version number of this License which applies to it and
+
+"any later version", you have the option of following the terms and
+
+conditions either of that version or of any later version published by
+
+the Free Software Foundation.  If the Library does not specify a
+
+license version number, you may choose any version ever published by
+
+the Free Software Foundation.
+
+
+
+  14. If you wish to incorporate parts of the Library into other free
+
+programs whose distribution conditions are incompatible with these,
+
+write to the author to ask for permission.  For software which is
+
+copyrighted by the Free Software Foundation, write to the Free
+
+Software Foundation; we sometimes make exceptions for this.  Our
+
+decision will be guided by the two goals of preserving the free status
+
+of all derivatives of our free software and of promoting the sharing
+
+and reuse of software generally.
+
+
+
+			    NO WARRANTY
+
+
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+
+DAMAGES.
+
+
+
+		     END OF TERMS AND CONDITIONS
+
+
+
+     Appendix: How to Apply These Terms to Your New Libraries
+
+
+
+  If you develop a new library, and you want it to be of the greatest
+
+possible use to the public, we recommend making it free software that
+
+everyone can redistribute and change.  You can do so by permitting
+
+redistribution under these terms (or, alternatively, under the terms of the
+
+ordinary General Public License).
+
+
+
+  To apply these terms, attach the following notices to the library.  It is
+
+safest to attach them to the start of each source file to most effectively
+
+convey the exclusion of warranty; and each file should have at least the
+
+"copyright" line and a pointer to where the full notice is found.
+
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+
+    Copyright (C) <year>  <name of author>
+
+
+
+    This library is free software; you can redistribute it and/or
+
+    modify it under the terms of the GNU Library General Public
+
+    License as published by the Free Software Foundation; either
+
+    version 2 of the License, or (at your option) any later version.
+
+
+
+    This library is distributed in the hope that it will be useful,
+
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+
+    Library General Public License for more details.
+
+
+
+    You should have received a copy of the GNU Library General Public
+
+    License along with this library; if not, write to the Free
+
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+
+
+You should also get your employer (if you work as a programmer) or your
+
+school, if any, to sign a "copyright disclaimer" for the library, if
+
+necessary.  Here is a sample; alter the names:
+
+
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+
+
+  <signature of Ty Coon>, 1 April 1990
+
+  Ty Coon, President of Vice
+
+
+
+That's all there is to it!
diff --git a/sql-odbc/src/sqlodbc/bind.c b/sql-odbc/src/sqlodbc/bind.c
index c5f21e7a83..889c4c66c1 100644
--- a/sql-odbc/src/sqlodbc/bind.c
+++ b/sql-odbc/src/sqlodbc/bind.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "bind.h"
 
 #include <ctype.h>
diff --git a/sql-odbc/src/sqlodbc/bind.h b/sql-odbc/src/sqlodbc/bind.h
index 5d6a4cdc05..adcdb66999 100644
--- a/sql-odbc/src/sqlodbc/bind.h
+++ b/sql-odbc/src/sqlodbc/bind.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __BIND_H__
 #define __BIND_H__
 
diff --git a/sql-odbc/src/sqlodbc/catfunc.h b/sql-odbc/src/sqlodbc/catfunc.h
index ac48261ccb..8378454256 100644
--- a/sql-odbc/src/sqlodbc/catfunc.h
+++ b/sql-odbc/src/sqlodbc/catfunc.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __CATFUNC_H__
 #define __CATFUNC_H__
 
diff --git a/sql-odbc/src/sqlodbc/columninfo.c b/sql-odbc/src/sqlodbc/columninfo.c
index a10e591a26..8c31901b2d 100644
--- a/sql-odbc/src/sqlodbc/columninfo.c
+++ b/sql-odbc/src/sqlodbc/columninfo.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "columninfo.h"
 
 #include <stdlib.h>
diff --git a/sql-odbc/src/sqlodbc/columninfo.h b/sql-odbc/src/sqlodbc/columninfo.h
index eb39ba4adf..01afe68db4 100644
--- a/sql-odbc/src/sqlodbc/columninfo.h
+++ b/sql-odbc/src/sqlodbc/columninfo.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __COLUMNINFO_H__
 #define __COLUMNINFO_H__
 
diff --git a/sql-odbc/src/sqlodbc/connection.c b/sql-odbc/src/sqlodbc/connection.c
index 70afd65581..597ab12b4d 100644
--- a/sql-odbc/src/sqlodbc/connection.c
+++ b/sql-odbc/src/sqlodbc/connection.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 /*	TryEnterCritiaclSection needs the following #define */
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0400
diff --git a/sql-odbc/src/sqlodbc/convert.c b/sql-odbc/src/sqlodbc/convert.c
index e0c1fce176..8cc686aaed 100644
--- a/sql-odbc/src/sqlodbc/convert.c
+++ b/sql-odbc/src/sqlodbc/convert.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "convert.h"
 
 #include "misc.h"
diff --git a/sql-odbc/src/sqlodbc/convert.h b/sql-odbc/src/sqlodbc/convert.h
index ec601be93d..c833f46720 100644
--- a/sql-odbc/src/sqlodbc/convert.h
+++ b/sql-odbc/src/sqlodbc/convert.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __CONVERT_H__
 #define __CONVERT_H__
 
diff --git a/sql-odbc/src/sqlodbc/descriptor.c b/sql-odbc/src/sqlodbc/descriptor.c
index 88adebafe5..3c668f24dc 100644
--- a/sql-odbc/src/sqlodbc/descriptor.c
+++ b/sql-odbc/src/sqlodbc/descriptor.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "descriptor.h"
 
 #include <ctype.h>
diff --git a/sql-odbc/src/sqlodbc/descriptor.h b/sql-odbc/src/sqlodbc/descriptor.h
index 5b9d4131aa..59831d8d97 100644
--- a/sql-odbc/src/sqlodbc/descriptor.h
+++ b/sql-odbc/src/sqlodbc/descriptor.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __DESCRIPTOR_H__
 #define __DESCRIPTOR_H__
 
diff --git a/sql-odbc/src/sqlodbc/dlg_specific.c b/sql-odbc/src/sqlodbc/dlg_specific.c
index f5b60bcb0d..f210bf0257 100644
--- a/sql-odbc/src/sqlodbc/dlg_specific.c
+++ b/sql-odbc/src/sqlodbc/dlg_specific.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "dlg_specific.h"
 
 #include <ctype.h>
diff --git a/sql-odbc/src/sqlodbc/dlg_specific.h b/sql-odbc/src/sqlodbc/dlg_specific.h
index 75926a6850..9b67d84cd5 100644
--- a/sql-odbc/src/sqlodbc/dlg_specific.h
+++ b/sql-odbc/src/sqlodbc/dlg_specific.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __DLG_SPECIFIC_H__
 #define __DLG_SPECIFIC_H__
 
diff --git a/sql-odbc/src/sqlodbc/dlg_wingui.c b/sql-odbc/src/sqlodbc/dlg_wingui.c
index 2bf9722725..7760d05cd0 100644
--- a/sql-odbc/src/sqlodbc/dlg_wingui.c
+++ b/sql-odbc/src/sqlodbc/dlg_wingui.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifdef WIN32
 
 #include "dlg_specific.h"
diff --git a/sql-odbc/src/sqlodbc/drvconn.c b/sql-odbc/src/sqlodbc/drvconn.c
index d8a3cb21ac..e4e53def22 100644
--- a/sql-odbc/src/sqlodbc/drvconn.c
+++ b/sql-odbc/src/sqlodbc/drvconn.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "drvconn.h"
 
 #include <stdio.h>
diff --git a/sql-odbc/src/sqlodbc/drvconn.h b/sql-odbc/src/sqlodbc/drvconn.h
index 3dce6e2373..3a00957b8b 100644
--- a/sql-odbc/src/sqlodbc/drvconn.h
+++ b/sql-odbc/src/sqlodbc/drvconn.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef _DRVCONN_H_
 #define _DRVCONN_H_
 
diff --git a/sql-odbc/src/sqlodbc/environ.c b/sql-odbc/src/sqlodbc/environ.c
index e99bdd3a24..c12dc085a7 100644
--- a/sql-odbc/src/sqlodbc/environ.c
+++ b/sql-odbc/src/sqlodbc/environ.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "environ.h"
 
 #include <stdlib.h>
diff --git a/sql-odbc/src/sqlodbc/environ.h b/sql-odbc/src/sqlodbc/environ.h
index 9f2ff0d460..bcbb04b78a 100644
--- a/sql-odbc/src/sqlodbc/environ.h
+++ b/sql-odbc/src/sqlodbc/environ.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __ENVIRON_H__
 #define __ENVIRON_H__
 
diff --git a/sql-odbc/src/sqlodbc/execute.c b/sql-odbc/src/sqlodbc/execute.c
index f736c3012f..f2f2cd24e3 100644
--- a/sql-odbc/src/sqlodbc/execute.c
+++ b/sql-odbc/src/sqlodbc/execute.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/info.c b/sql-odbc/src/sqlodbc/info.c
index 1f7295502c..6925f490ef 100644
--- a/sql-odbc/src/sqlodbc/info.c
+++ b/sql-odbc/src/sqlodbc/info.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/loadlib.c b/sql-odbc/src/sqlodbc/loadlib.c
index cc3c046fa4..78015e63fa 100644
--- a/sql-odbc/src/sqlodbc/loadlib.c
+++ b/sql-odbc/src/sqlodbc/loadlib.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sql-odbc/src/sqlodbc/loadlib.h b/sql-odbc/src/sqlodbc/loadlib.h
index 1051432761..16a6c03937 100644
--- a/sql-odbc/src/sqlodbc/loadlib.h
+++ b/sql-odbc/src/sqlodbc/loadlib.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __LOADLIB_H__
 #define __LOADLIB_H__
 
diff --git a/sql-odbc/src/sqlodbc/misc.c b/sql-odbc/src/sqlodbc/misc.c
index c6e2bb4143..867c7744fe 100644
--- a/sql-odbc/src/sqlodbc/misc.c
+++ b/sql-odbc/src/sqlodbc/misc.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "opensearch_odbc.h"
 #include "misc.h"
diff --git a/sql-odbc/src/sqlodbc/misc.h b/sql-odbc/src/sqlodbc/misc.h
index b9fdc5f72f..f589cbcb98 100644
--- a/sql-odbc/src/sqlodbc/misc.h
+++ b/sql-odbc/src/sqlodbc/misc.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __MISC_H__
 #define __MISC_H__
 
diff --git a/sql-odbc/src/sqlodbc/multibyte.c b/sql-odbc/src/sqlodbc/multibyte.c
index 38257aa1ae..4c5fb0d465 100644
--- a/sql-odbc/src/sqlodbc/multibyte.c
+++ b/sql-odbc/src/sqlodbc/multibyte.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "multibyte.h"
 
 #include <ctype.h>
diff --git a/sql-odbc/src/sqlodbc/multibyte.h b/sql-odbc/src/sqlodbc/multibyte.h
index f9cc861fcb..26bfb6f061 100644
--- a/sql-odbc/src/sqlodbc/multibyte.h
+++ b/sql-odbc/src/sqlodbc/multibyte.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __MULTIBUYTE_H__
 #define __MULTIBUYTE_H__
 
diff --git a/sql-odbc/src/sqlodbc/mylog.c b/sql-odbc/src/sqlodbc/mylog.c
index a8c4d14ebe..2933a1cab0 100644
--- a/sql-odbc/src/sqlodbc/mylog.c
+++ b/sql-odbc/src/sqlodbc/mylog.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #define _MYLOG_FUNCS_IMPLEMENT_
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/sql-odbc/src/sqlodbc/mylog.h b/sql-odbc/src/sqlodbc/mylog.h
index 1dc5ae3879..c7ee6710c7 100644
--- a/sql-odbc/src/sqlodbc/mylog.h
+++ b/sql-odbc/src/sqlodbc/mylog.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __MYLOG_H__
 #define __MYLOG_H__
 
diff --git a/sql-odbc/src/sqlodbc/odbcapi.c b/sql-odbc/src/sqlodbc/odbcapi.c
index cd8b28c072..58cd9dff5d 100644
--- a/sql-odbc/src/sqlodbc/odbcapi.c
+++ b/sql-odbc/src/sqlodbc/odbcapi.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/odbcapi30.c b/sql-odbc/src/sqlodbc/odbcapi30.c
index 5922a73f14..83b249015d 100644
--- a/sql-odbc/src/sqlodbc/odbcapi30.c
+++ b/sql-odbc/src/sqlodbc/odbcapi30.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/odbcapi30w.c b/sql-odbc/src/sqlodbc/odbcapi30w.c
index dc5721afee..dd8cf0d3a0 100644
--- a/sql-odbc/src/sqlodbc/odbcapi30w.c
+++ b/sql-odbc/src/sqlodbc/odbcapi30w.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/odbcapiw.c b/sql-odbc/src/sqlodbc/odbcapiw.c
index 87c12cca7c..6b22948f90 100644
--- a/sql-odbc/src/sqlodbc/odbcapiw.c
+++ b/sql-odbc/src/sqlodbc/odbcapiw.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_api30.c b/sql-odbc/src/sqlodbc/opensearch_api30.c
index c639b8b364..25baeb7915 100644
--- a/sql-odbc/src/sqlodbc/opensearch_api30.c
+++ b/sql-odbc/src/sqlodbc/opensearch_api30.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_apifunc.h b/sql-odbc/src/sqlodbc/opensearch_apifunc.h
index 14c19cd116..1901fe8cd0 100644
--- a/sql-odbc/src/sqlodbc/opensearch_apifunc.h
+++ b/sql-odbc/src/sqlodbc/opensearch_apifunc.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef _OPENSEARCH_API_FUNC_H__
 #define _OPENSEARCH_API_FUNC_H__
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_communication.cpp b/sql-odbc/src/sqlodbc/opensearch_communication.cpp
index bac9af717d..ce970e0225 100644
--- a/sql-odbc/src/sqlodbc/opensearch_communication.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_communication.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_communication.h"
 
 // sqlodbc needs to be included before mylog, otherwise mylog will generate
diff --git a/sql-odbc/src/sqlodbc/opensearch_communication.h b/sql-odbc/src/sqlodbc/opensearch_communication.h
index 88f981159b..b37ccc3535 100644
--- a/sql-odbc/src/sqlodbc/opensearch_communication.h
+++ b/sql-odbc/src/sqlodbc/opensearch_communication.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef OPENSEARCH_COMMUNICATION
 #define OPENSEARCH_COMMUNICATION
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_connection.cpp b/sql-odbc/src/sqlodbc/opensearch_connection.cpp
index 475d300791..fdb2179b92 100644
--- a/sql-odbc/src/sqlodbc/opensearch_connection.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_connection.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 /*	TryEnterCriticalSection needs the following #define */
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0400
diff --git a/sql-odbc/src/sqlodbc/opensearch_connection.h b/sql-odbc/src/sqlodbc/opensearch_connection.h
index 53cb9f529c..bc4a699c97 100644
--- a/sql-odbc/src/sqlodbc/opensearch_connection.h
+++ b/sql-odbc/src/sqlodbc/opensearch_connection.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCHCONNECTION_H__
 #define __OPENSEARCHCONNECTION_H__
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp b/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp
index bf31aeaabd..29e3f3c012 100644
--- a/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_driver_connect.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_driver_connect.h"
 
 #include <stdio.h>
diff --git a/sql-odbc/src/sqlodbc/opensearch_driver_connect.h b/sql-odbc/src/sqlodbc/opensearch_driver_connect.h
index 8553510c57..f5683e057b 100644
--- a/sql-odbc/src/sqlodbc/opensearch_driver_connect.h
+++ b/sql-odbc/src/sqlodbc/opensearch_driver_connect.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCH_DRIVER_CONNECT_H__
 #define __OPENSEARCH_DRIVER_CONNECT_H__
 #include "opensearch_connection.h"
diff --git a/sql-odbc/src/sqlodbc/opensearch_helper.cpp b/sql-odbc/src/sqlodbc/opensearch_helper.cpp
index 2e4c555ff1..9b50aff6cc 100644
--- a/sql-odbc/src/sqlodbc/opensearch_helper.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_helper.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_helper.h"
 
 #include <atomic>
diff --git a/sql-odbc/src/sqlodbc/opensearch_helper.h b/sql-odbc/src/sqlodbc/opensearch_helper.h
index 9ba8ffa84c..0433c0a7b8 100644
--- a/sql-odbc/src/sqlodbc/opensearch_helper.h
+++ b/sql-odbc/src/sqlodbc/opensearch_helper.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCH_HELPER_H__
 #define __OPENSEARCH_HELPER_H__
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_info.cpp b/sql-odbc/src/sqlodbc/opensearch_info.cpp
index b2076e6def..a5218460a1 100644
--- a/sql-odbc/src/sqlodbc/opensearch_info.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_info.cpp
@@ -1,8 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 #include "opensearch_info.h"
 
 #include <stdio.h>
diff --git a/sql-odbc/src/sqlodbc/opensearch_info.h b/sql-odbc/src/sqlodbc/opensearch_info.h
index 0552279340..bbe1906518 100644
--- a/sql-odbc/src/sqlodbc/opensearch_info.h
+++ b/sql-odbc/src/sqlodbc/opensearch_info.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCH_INFO_H__
 #define __OPENSEARCH_INFO_H__
 #include "opensearch_helper.h"
diff --git a/sql-odbc/src/sqlodbc/opensearch_odbc.c b/sql-odbc/src/sqlodbc/opensearch_odbc.c
index 182c576f56..ce753eb3d6 100644
--- a/sql-odbc/src/sqlodbc/opensearch_odbc.c
+++ b/sql-odbc/src/sqlodbc/opensearch_odbc.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifdef WIN32
 #ifdef _DEBUG
 #include <crtdbg.h>
diff --git a/sql-odbc/src/sqlodbc/opensearch_odbc.h b/sql-odbc/src/sqlodbc/opensearch_odbc.h
index 886e44ca6e..23ba2c3f68 100644
--- a/sql-odbc/src/sqlodbc/opensearch_odbc.h
+++ b/sql-odbc/src/sqlodbc/opensearch_odbc.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __OPENSEARCHODBC_H__
 #define __OPENSEARCHODBC_H__
 #include <stdarg.h>
diff --git a/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp b/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp
index a48c708342..aa77d718b9 100644
--- a/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_parse_result.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_parse_result.h"
 
 #include <unordered_map>
diff --git a/sql-odbc/src/sqlodbc/opensearch_parse_result.h b/sql-odbc/src/sqlodbc/opensearch_parse_result.h
index ad7c88a9ec..b74f180901 100644
--- a/sql-odbc/src/sqlodbc/opensearch_parse_result.h
+++ b/sql-odbc/src/sqlodbc/opensearch_parse_result.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef _OPENSEARCH_PARSE_RESULT_H_
 #define _OPENSEARCH_PARSE_RESULT_H_
 #include "qresult.h"
diff --git a/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp b/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp
index c07e9d6a6c..dc6d3ddd7a 100644
--- a/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_result_queue.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_result_queue.h"
 
 #include "opensearch_types.h"
diff --git a/sql-odbc/src/sqlodbc/opensearch_result_queue.h b/sql-odbc/src/sqlodbc/opensearch_result_queue.h
index c7bc4a3ed1..fef33da401 100644
--- a/sql-odbc/src/sqlodbc/opensearch_result_queue.h
+++ b/sql-odbc/src/sqlodbc/opensearch_result_queue.h
@@ -1,8 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 #ifndef OPENSEARCH_RESULT_QUEUE
 #define OPENSEARCH_RESULT_QUEUE
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp b/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp
index b9edeaf8e7..c35ac77461 100644
--- a/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_semaphore.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_semaphore.h"
 
 #include <string>
diff --git a/sql-odbc/src/sqlodbc/opensearch_semaphore.h b/sql-odbc/src/sqlodbc/opensearch_semaphore.h
index d407e4f038..a5ffdbfc0e 100644
--- a/sql-odbc/src/sqlodbc/opensearch_semaphore.h
+++ b/sql-odbc/src/sqlodbc/opensearch_semaphore.h
@@ -1,8 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 #ifndef OPENSEARCH_SEMAPHORE
 #define OPENSEARCH_SEMAPHORE
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_statement.cpp b/sql-odbc/src/sqlodbc/opensearch_statement.cpp
index e7db2a617e..94a91d0f77 100644
--- a/sql-odbc/src/sqlodbc/opensearch_statement.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_statement.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_statement.h"
 
 #include "environ.h"  // Critical section for statment
diff --git a/sql-odbc/src/sqlodbc/opensearch_statement.h b/sql-odbc/src/sqlodbc/opensearch_statement.h
index 27191a1fde..620e0802e1 100644
--- a/sql-odbc/src/sqlodbc/opensearch_statement.h
+++ b/sql-odbc/src/sqlodbc/opensearch_statement.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef _OPENSEARCH_STATEMENT_H_
 #define _OPENSEARCH_STATEMENT_H_
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_types.c b/sql-odbc/src/sqlodbc/opensearch_types.c
index bde5e15d93..ba8a00fece 100644
--- a/sql-odbc/src/sqlodbc/opensearch_types.c
+++ b/sql-odbc/src/sqlodbc/opensearch_types.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_types.h"
 
 #include "dlg_specific.h"
diff --git a/sql-odbc/src/sqlodbc/opensearch_types.h b/sql-odbc/src/sqlodbc/opensearch_types.h
index 5bec08b4ea..68c8ca5e4a 100644
--- a/sql-odbc/src/sqlodbc/opensearch_types.h
+++ b/sql-odbc/src/sqlodbc/opensearch_types.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef OPENSEARCH_TYPES
 #define OPENSEARCH_TYPES
 
diff --git a/sql-odbc/src/sqlodbc/opensearch_utility.cpp b/sql-odbc/src/sqlodbc/opensearch_utility.cpp
index 5461c05b9a..faac8f389e 100644
--- a/sql-odbc/src/sqlodbc/opensearch_utility.cpp
+++ b/sql-odbc/src/sqlodbc/opensearch_utility.cpp
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "opensearch_utility.h"
 
 #include <ctype.h>
diff --git a/sql-odbc/src/sqlodbc/opensearch_utility.h b/sql-odbc/src/sqlodbc/opensearch_utility.h
index 8af76235f2..bd5d3463c6 100644
--- a/sql-odbc/src/sqlodbc/opensearch_utility.h
+++ b/sql-odbc/src/sqlodbc/opensearch_utility.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef OPENSEARCH_UTILITY_H
 #define OPENSEARCH_UTILITY_H
 
diff --git a/sql-odbc/src/sqlodbc/options.c b/sql-odbc/src/sqlodbc/options.c
index 817ecb6300..243b9385ae 100644
--- a/sql-odbc/src/sqlodbc/options.c
+++ b/sql-odbc/src/sqlodbc/options.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <string.h>
 
 #include "environ.h"
diff --git a/sql-odbc/src/sqlodbc/parse.c b/sql-odbc/src/sqlodbc/parse.c
index ceacc0bde9..670a61a6cd 100644
--- a/sql-odbc/src/sqlodbc/parse.c
+++ b/sql-odbc/src/sqlodbc/parse.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sql-odbc/src/sqlodbc/qresult.c b/sql-odbc/src/sqlodbc/qresult.c
index ea21bed58c..27c299098a 100644
--- a/sql-odbc/src/sqlodbc/qresult.c
+++ b/sql-odbc/src/sqlodbc/qresult.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include "qresult.h"
 
 #include <limits.h>
diff --git a/sql-odbc/src/sqlodbc/qresult.h b/sql-odbc/src/sqlodbc/qresult.h
index 133942afec..4e44c24638 100644
--- a/sql-odbc/src/sqlodbc/qresult.h
+++ b/sql-odbc/src/sqlodbc/qresult.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __QRESULT_H__
 #define __QRESULT_H__
 
diff --git a/sql-odbc/src/sqlodbc/resource.h b/sql-odbc/src/sqlodbc/resource.h
index df6685dc18..ff5fc59c8d 100644
--- a/sql-odbc/src/sqlodbc/resource.h
+++ b/sql-odbc/src/sqlodbc/resource.h
@@ -1,8 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by opensearch_odbc.rc
diff --git a/sql-odbc/src/sqlodbc/results.c b/sql-odbc/src/sqlodbc/results.c
index fce971de20..7420062382 100644
--- a/sql-odbc/src/sqlodbc/results.c
+++ b/sql-odbc/src/sqlodbc/results.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/sql-odbc/src/sqlodbc/setup.c b/sql-odbc/src/sqlodbc/setup.c
index 3155bb00dc..d855298abf 100644
--- a/sql-odbc/src/sqlodbc/setup.c
+++ b/sql-odbc/src/sqlodbc/setup.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifdef WIN32
 #include "opensearch_enlist.h"
 #include "opensearch_odbc.h"
diff --git a/sql-odbc/src/sqlodbc/statement.c b/sql-odbc/src/sqlodbc/statement.c
index c86c8750be..ea4ece9d98 100644
--- a/sql-odbc/src/sqlodbc/statement.c
+++ b/sql-odbc/src/sqlodbc/statement.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "statement.h"
 #include "misc.h" // strncpy_null
diff --git a/sql-odbc/src/sqlodbc/statement.h b/sql-odbc/src/sqlodbc/statement.h
index 22d14d4ee7..7dc57ff05c 100644
--- a/sql-odbc/src/sqlodbc/statement.h
+++ b/sql-odbc/src/sqlodbc/statement.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __STATEMENT_H__
 #define __STATEMENT_H__
 
diff --git a/sql-odbc/src/sqlodbc/tuple.c b/sql-odbc/src/sqlodbc/tuple.c
index 6fc2d748bb..d8a7c06126 100644
--- a/sql-odbc/src/sqlodbc/tuple.c
+++ b/sql-odbc/src/sqlodbc/tuple.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 // clang-format off
 #include "tuple.h"
 #include "misc.h"
diff --git a/sql-odbc/src/sqlodbc/tuple.h b/sql-odbc/src/sqlodbc/tuple.h
index 966eaafe4c..cc5a29eec1 100644
--- a/sql-odbc/src/sqlodbc/tuple.h
+++ b/sql-odbc/src/sqlodbc/tuple.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __TUPLE_H__
 #define __TUPLE_H__
 
diff --git a/sql-odbc/src/sqlodbc/unicode_support.h b/sql-odbc/src/sqlodbc/unicode_support.h
index cbff3f56ed..2a481b0c06 100644
--- a/sql-odbc/src/sqlodbc/unicode_support.h
+++ b/sql-odbc/src/sqlodbc/unicode_support.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __UNICODE_SUPPORT_H__
 #define __UNICODE_SUPPORT_H__
 
diff --git a/sql-odbc/src/sqlodbc/version.h b/sql-odbc/src/sqlodbc/version.h
index a011cea7bd..baf7e67abc 100644
--- a/sql-odbc/src/sqlodbc/version.h
+++ b/sql-odbc/src/sqlodbc/version.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef __VERSION_H__
 #define __VERSION_H__
 
diff --git a/sql-odbc/src/sqlodbc/win_setup.h b/sql-odbc/src/sqlodbc/win_setup.h
index 281e9d8313..9abae27d30 100644
--- a/sql-odbc/src/sqlodbc/win_setup.h
+++ b/sql-odbc/src/sqlodbc/win_setup.h
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifndef _WIN_SETUP_H__
 #define _WIN_SETUP_H__
 
diff --git a/sql-odbc/src/sqlodbc/win_unicode.c b/sql-odbc/src/sqlodbc/win_unicode.c
index 965373a557..5bc03b64fd 100644
--- a/sql-odbc/src/sqlodbc/win_unicode.c
+++ b/sql-odbc/src/sqlodbc/win_unicode.c
@@ -1,9 +1,3 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-
 #ifdef UNICODE_SUPPORT
 
 #include <ctype.h>