diff --git a/.gitmodules b/.gitmodules
index d0b66b90..046dc481 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,3 @@
-[submodule "sql/dw-vldb-samples"]
-	path = sql/dw-vldb-samples
-	url = https://github.com/oracle/dw-vldb-samples
-	branch = master
 [submodule "db-sample-schemas"]
 	path = db-sample-schemas
 	url = https://github.com/oracle/db-sample-schemas
-	branch = main
-[submodule "dotnet"]
-	path = dotnet
-	url = https://github.com/oracle/dotnet-db-samples
-	branch = master
diff --git a/README.md b/README.md
index a7aaa3bb..2e24d8a3 100644
--- a/README.md
+++ b/README.md
@@ -4,42 +4,45 @@ This repository stores a variety of examples demonstrating how to use the Oracle
 | Repo/Folder name  | Description |
 | ------------- | ------------- |
 | [C](./C) | C examples |
+| [Multicloud](./Multicloud) | Multicloud examples |
 | [apex](./apex) | APEX examples |
 | [db-sample-schemas](https://github.com/oracle/db-sample-schemas) | Git submodule of the Oracle Database Sample Schemas |
-| [dotnet](https://github.com/oracle/dotnet-db-samples) | .NET based examples |
 | [exadata](./exadata) | Exadata examples |
 | [java](./java)  | Java examples |
 | [javascript](./javascript) | JavaScript examples |
+| [json-relational-duality](./json-relational-duality) | JSON Relational Duality examples
 | [machine-learning](./machine-learning) | Oracle Machine Learning examples |
-| [optimizer](./optimizer) | Oracle Optmizer and Optimizer Stats examples |
+| [optimizer](./optimizer) | Oracle Optimizer and Optimizer Stats examples |
 | [plsql](./plsql) | PL/SQL examples |
 | [python](./python) | Python examples |
 | [ruby](./ruby) | Ruby examples |
-| [sagas](./sagas) | Saga examples |
+| [sagas](./sagas) | Sagas examples |
 | [security](./security) | Security features examples |
 | [spatial](./spatial) | Spatial features examples |
+| [sql-firewall](./sql-firewall) | SQL Firewall examples |
 | [sql](./sql) | SQL examples |
 | [sqldeveloper](./sqldeveloper) | [SQL Developer](http://www.oracle.com/technetwork/developer-tools/sql-developer/) examples |
+| [text](./text) | Oracle Text examples |
 | [txeventq](./txeventq) | TxEventQ examples |
 
 ## Documentation
-You can find the online documentation of the Oracle Database under [docs.oracle.com/en/database/](http://docs.oracle.com/en/database/)
+You can find the online documentation of the Oracle Database under: [docs.oracle.com/en/database/](http://docs.oracle.com/en/database/)
 
 ## LiveSQL
-Some of the examples that you see within this repository can be executed in the free web-based tool: [LiveSQL.oracle.com](https://livesql.oracle.com).
+Some of the examples that you see within this repository can be executed in the free web-based tool: [LiveSQL.oracle.com](https://livesql.oracle.com)
 
 LiveSQL is also an excellent resource for getting started with Oracle Database.
 
 ## Dev Gym
-If you would like to challenge yourself, you can take quizzes, workouts and classes at [DevGym.oracle.com](https://devgym.oracle.com).
+If you would like to challenge yourself, you can take quizzes, workouts and classes at: [DevGym.oracle.com](https://devgym.oracle.com)
 
 ## Contributing
 
-This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
+This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md).
 
 ## Security
 
-Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
+Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process.
 
 ## License
 
@@ -48,7 +51,7 @@ Apache License, Version 2.0 (the "License.")
 
 You may obtain a copy of the License at
 http://www.apache.org/licenses/LICENSE-2.0.  A copy of the license is
-also reproduced in [LICENSE.md](./LICENSE.md)
+also reproduced in [LICENSE.txt](./LICENSE.txt).
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/db-sample-schemas b/db-sample-schemas
index 99049719..f5204d17 160000
--- a/db-sample-schemas
+++ b/db-sample-schemas
@@ -1 +1 @@
-Subproject commit 99049719d53c2e0810b7a8462965636b98161131
+Subproject commit f5204d177d7641a468846764b67a4ee41d42ff26
diff --git a/dotnet b/dotnet
deleted file mode 160000
index fbab2e6e..00000000
--- a/dotnet
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fbab2e6efd04785fbd41a1f79b24c29c2cbfd5fc
diff --git a/sql/dw-vldb-samples b/sql/dw-vldb-samples
deleted file mode 160000
index 36b46958..00000000
--- a/sql/dw-vldb-samples
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 36b46958aa0a04dc96c8e38870278999b62c6fc6