6 files changed, 2 insertions, 66 deletions
diff --git a/docs/guides/onap-developer/apiref/index.rst b/docs/guides/onap-developer/apiref/index.rst
index 1e6792348..bc3c1840a 100644
--- a/docs/guides/onap-developer/apiref/index.rst
+++ b/docs/guides/onap-developer/apiref/index.rst
@@ -53,12 +53,3 @@ Common Services
 * :ref:`MSB - Micro Services Bus<onap-msb-apigateway:offeredapis>`
 * :ref:`Multi Cloud<onap-multicloud-framework:offeredapis>`
 * :ref:`OPTF - Optimization Framework<onap-optf-osdf:offeredapis>`
-
-SDK
----
-
-.. toctree::
-   :maxdepth: 1
-   :titlesonly:
-
-* :ref:`VNF Software Development Kit<onap-vnfsdk-model:offeredapis>`
diff --git a/docs/guides/onap-developer/architecture/onap-architecture.rst b/docs/guides/onap-developer/architecture/onap-architecture.rst
index d66464e93..5c45b4afa 100644
--- a/docs/guides/onap-developer/architecture/onap-architecture.rst
+++ b/docs/guides/onap-developer/architecture/onap-architecture.rst
@@ -597,8 +597,7 @@ requirements of various use cases, guide the development and bring consistency
 among ONAP components and explore a common model to improve the
 interoperability of ONAP.
 
-ONAP supports various models detailed in
-:ref:`Modeling Documentation<onap-modeling-modelspec:master_index>`.
+ONAP supports various models detailed in the Modeling documentation.
 
 The modeling project includes the ETSI catalog component, which provides the
 parser functionalities, as well as additional package management
diff --git a/docs/guides/onap-developer/architecture/references.rst b/docs/guides/onap-developer/architecture/references.rst
index 08e119de1..a169c5797 100644
--- a/docs/guides/onap-developer/architecture/references.rst
+++ b/docs/guides/onap-developer/architecture/references.rst
@@ -14,15 +14,6 @@
 References
 ==========
 
-Models
-------
-
-.. toctree::
-   :maxdepth: 1
-   :titlesonly:
-
-:ref:`Model Specifications<onap-modeling-modelspec:master_index>`
-
 User Interfaces
 ---------------
 
@@ -31,7 +22,6 @@ User Interfaces
    :titlesonly:
 
 | :ref:`Policy/CLAMP - Closed Loop Automation Platform<onap-policy-parent:clamp-label>`
-| :ref:`CLI - Command Line Interface<onap-cli:architecture>`
 | :ref:`SDC - Service Design and Creation<onap-sdc:architecture>`
 | :ref:`UUI- Usecase UI<onap-usecase-ui:architecture>`
 
@@ -63,4 +53,3 @@ Common Services
 | :ref:`Multi Cloud<onap-multicloud-framework:multicloud-administrator-guide>`
 | :ref:`OOM - ONAP Operations Manager<onap-oom:oom_project_description>`
 | :ref:`OPTF - Optimization Framework<onap-optf-osdf:architecture>`
-| :ref:`VNF SDK<onap-vnfsdk-model:offeredapis>`
diff --git a/docs/guides/onap-developer/developing/index.rst b/docs/guides/onap-developer/developing/index.rst
index ab21b936a..ec8050f24 100644
--- a/docs/guides/onap-developer/developing/index.rst
+++ b/docs/guides/onap-developer/developing/index.rst
@@ -46,19 +46,6 @@ CCSDK - Common Controller Software Development Kit
    * - :ref:`ccsdk/oran<onap-ccsdk-oran:master_index>`
      - O-RAN Support in ONAP
 
-
-CLI - Command Line Interface
-----------------------------
-
-.. list-table::
-   :widths: auto
-   :header-rows: 1
-
-   * - Component
-     - Documentation
-   * - :ref:`cli<onap-cli:master_index>`
-     - CLI
-
 CPS - Configuration Persistence Service
 ---------------------------------------
 
@@ -138,8 +125,6 @@ MOD - Modeling
 
    * - Component
      - Documentation
-   * - :ref:`modeling/modelspec<onap-modeling-modelspec:master_index>`
-     - Model Specification
    * - :ref:`modeling/etsicatalog<onap-modeling-etsicatalog:master_index>`
      - ETSI Runtime Catalog
 
@@ -186,8 +171,6 @@ OOM - ONAP Operations Manager
      - Documentation
    * - :ref:`oom<onap-oom:master_index>`
      - ONAP Operations Manager
-   * - :ref:`oom/platform/cert-service<onap-oom-platform-cert-service:master_index>`
-     - ONAP CMPv2 Certification Support
    * - :ref:`oom/offline-installer<onap-oom-offline-installer:master_index>`
      - OOM Offline Installer
 
@@ -277,14 +260,3 @@ VFC - Virtual Function Controller
    * - :ref:`vfc/nfvo/lcm<onap-vfc-nfvo-lcm:master_index>`
      - Virtual Function Controller Architecture, APIs and Guides
 
-VNFSDK - VNF Software Development Kit
--------------------------------------
-
-.. list-table::
-   :widths: auto
-   :header-rows: 1
-
-   * - Component
-     - Documentation
-   * - :ref:`vnfsdk/model<onap-vnfsdk-model:master_index>`
-     - VNF SDK, User Guides
diff --git a/docs/guides/onap-user/index.rst b/docs/guides/onap-user/index.rst
index b3e9fc655..adc3a1177 100644
--- a/docs/guides/onap-user/index.rst
+++ b/docs/guides/onap-user/index.rst
@@ -24,12 +24,7 @@ E2E User Guides
 Component User Guides
 ---------------------
 
-.. toctree::
-   :maxdepth: 1
-
-   onapcli.rst
-
-For other ONAP components please review the individual
+For ONAP components please review the individual
 document sets in :ref:`doc_onap-developer_guide_projects`
 
 Verified Use Cases
diff --git a/docs/guides/onap-user/onapcli.rst b/docs/guides/onap-user/onapcli.rst
deleted file mode 100644
index 57b330c5f..000000000
--- a/docs/guides/onap-user/onapcli.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-
-
-ONAP CLI
-========
-
-.. toctree::
-   :maxdepth: 2
-
-:ref:`ONAP CLI userguide<onap-cli:cli_user_guide>`