aboutsummaryrefslogtreecommitdiffstats
path: root/src/site/asciidoc
diff options
context:
space:
mode:
Diffstat (limited to 'src/site/asciidoc')
-rw-r--r--src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc14
-rw-r--r--src/site/asciidoc/apex-intro/intro-introduction.adoc14
-rw-r--r--src/site/asciidoc/apex-intro/intro-policy-matrix.adoc14
-rw-r--r--src/site/asciidoc/apex-intro/intro-resources.adoc14
-rw-r--r--src/site/asciidoc/apex-intro/intro-upee-clustering.adoc14
-rw-r--r--src/site/asciidoc/apex-intro/intro-upee-deployment.adoc14
-rw-r--r--src/site/asciidoc/apex-publications.adoc48
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-site.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-standard.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/build/dg-build.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc14
-rw-r--r--src/site/asciidoc/developer-guide/dg-code-examples.adoc18
-rw-r--r--src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/pg-policy-examples.adoc16
-rw-r--r--src/site/asciidoc/policy-guide/pg-policy-matrix.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/pg-task-logic.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc14
-rw-r--r--src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc14
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc14
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc14
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc14
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc14
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-04-executors.adoc24
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-05-context.adoc16
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc32
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc24
-rw-r--r--src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc14
-rw-r--r--src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-build-apex.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-configure.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-docker.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-get-source.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-install.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-layout.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-verify.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install-wars.adoc14
-rw-r--r--src/site/asciidoc/user-manual/install/um-install.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc14
-rw-r--r--src/site/asciidoc/user-manual/logging/um-logging.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc16
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc14
-rw-r--r--src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc14
-rw-r--r--src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc21
107 files changed, 0 insertions, 1587 deletions
diff --git a/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc b/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc
deleted file mode 100644
index fad04941f..000000000
--- a/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/configuration-matrix.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-introduction.adoc b/src/site/asciidoc/apex-intro/intro-introduction.adoc
deleted file mode 100644
index 95219bb72..000000000
--- a/src/site/asciidoc/apex-intro/intro-introduction.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/introduction.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc b/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc
deleted file mode 100644
index 1e8510f2e..000000000
--- a/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/policy-matrix.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-resources.adoc b/src/site/asciidoc/apex-intro/intro-resources.adoc
deleted file mode 100644
index 37405a3ef..000000000
--- a/src/site/asciidoc/apex-intro/intro-resources.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/resources.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc b/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc
deleted file mode 100644
index c239cdf6a..000000000
--- a/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/upee-clustering.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc b/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc
deleted file mode 100644
index c3abf4845..000000000
--- a/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/upee-deployment.adoc[]
diff --git a/src/site/asciidoc/apex-publications.adoc b/src/site/asciidoc/apex-publications.adoc
deleted file mode 100644
index 6c030aeb4..000000000
--- a/src/site/asciidoc/apex-publications.adoc
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-== APEX Publications
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/apex.adoc[]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/cnsm-2015.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2016.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2017a.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2017b.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018a.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018d.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018c.adoc[leveloffset=+1]
-
-
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/policy-general.adoc[]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/monami-2012.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2013.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/monami-2013.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/cnsm-2014.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/5g-2015.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018b.adoc[leveloffset=+1]
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018e.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc b/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc
deleted file mode 100644
index 9fb2741e5..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc b/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc
deleted file mode 100644
index 0a5b3f4b5..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/documentation.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-site.adoc b/src/site/asciidoc/developer-guide/build/dg-build-site.adoc
deleted file mode 100644
index 727811cea..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-site.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/site.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc b/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc
deleted file mode 100644
index 1d08e71ab..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/standard.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc
deleted file mode 100644
index 57ec22156..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-all-components.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc
deleted file mode 100644
index 1bab557cd..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-all-tests.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc
deleted file mode 100644
index 3f11e99b0..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-tests.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build.adoc b/src/site/asciidoc/developer-guide/build/dg-build.adoc
deleted file mode 100644
index fcc48e9db..000000000
--- a/src/site/asciidoc/developer-guide/build/dg-build.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/introduction.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc
deleted file mode 100644
index 85ee11074..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/02-rules.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc
deleted file mode 100644
index 2c4f691e0..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/10-plugin-jautodoc.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc
deleted file mode 100644
index 2cafd21e0..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/11-plugin-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc
deleted file mode 100644
index c6ec70ac7..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/20-configure-eclipse-templates.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc
deleted file mode 100644
index b829d0d1f..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/21-configure-jautodoc-templates.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc
deleted file mode 100644
index 52dbd2fd8..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/30-configure-checkstyle-maven.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc
deleted file mode 100644
index 0ed5772c8..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/31-run-checkstyle-maven.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc
deleted file mode 100644
index 86cf187fa..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/32-configure-checkstyle-eclipse.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc
deleted file mode 100644
index b849963d3..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/33-configure-checkstyle-blueprint.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc
deleted file mode 100644
index 5bb23b0cb..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/40-use-eclipse-source-operations.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc
deleted file mode 100644
index 1ad1e69bc..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/41-using-jautodoc.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc
deleted file mode 100644
index a22ab99ef..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/42-using-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc
deleted file mode 100644
index 5320969c0..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/50-disable-eclispe-formatting.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc
deleted file mode 100644
index ec1f1ce1c..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/51-supress-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc
deleted file mode 100644
index eb0d982cf..000000000
--- a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/01-introduction.adoc[]
diff --git a/src/site/asciidoc/developer-guide/dg-code-examples.adoc b/src/site/asciidoc/developer-guide/dg-code-examples.adoc
deleted file mode 100644
index b14fe02fd..000000000
--- a/src/site/asciidoc/developer-guide/dg-code-examples.adoc
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-== Code Examples
-
-- APEX Applications (apex-apps)
- ** Utilities: link:../modules/tools/tools-common/example-cli.html[CLI Options and Parser Example]
- ** Utilities: link:../modules/tools/tools-common/example-cli-version.html[Autoversion for Applications Example]
diff --git a/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc b/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc
deleted file mode 100644
index c2053e15e..000000000
--- a/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/logic-cheatsheet.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-policy-examples.adoc b/src/site/asciidoc/policy-guide/pg-policy-examples.adoc
deleted file mode 100644
index ec357b270..000000000
--- a/src/site/asciidoc/policy-guide/pg-policy-examples.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-== Policy Examples
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/policy-examples.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc b/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc
deleted file mode 100644
index 1e8510f2e..000000000
--- a/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/policy-matrix.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-task-logic.adoc b/src/site/asciidoc/policy-guide/pg-task-logic.adoc
deleted file mode 100644
index 46c568c6c..000000000
--- a/src/site/asciidoc/policy-guide/pg-task-logic.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/task-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc b/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc
deleted file mode 100644
index 582229a2c..000000000
--- a/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/task-selection-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc
deleted file mode 100644
index 56a84ec3f..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextitem.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc
deleted file mode 100644
index 9b010fbb1..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextitemtemplate.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc
deleted file mode 100644
index 656cb63c3..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextmap.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc
deleted file mode 100644
index b687a7251..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-datatype.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc
deleted file mode 100644
index 0cb2cf88f..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-event.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc
deleted file mode 100644
index 76ffc11a7..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-eventfield.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc
deleted file mode 100644
index d96414861..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc
deleted file mode 100644
index a10a361ea..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-policy.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc
deleted file mode 100644
index 762daa720..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-policymodel.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc
deleted file mode 100644
index 79fd71786..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-state.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc
deleted file mode 100644
index 54f1d4b3f..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-task.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc
deleted file mode 100644
index 982e5c356..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-taskparameter.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc
deleted file mode 100644
index 024fca695..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concepts-keys.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc
deleted file mode 100644
index f4016f273..000000000
--- a/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc b/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc
deleted file mode 100644
index 6c8b9a5f2..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-config/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc b/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc
deleted file mode 100644
index 4401f4c06..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-general-format.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc b/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc
deleted file mode 100644
index b12c84a7d..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-service-parameters.adoc[] \ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc b/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc
deleted file mode 100644
index d82894de7..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-interfaces-general.adoc[] \ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc b/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc
deleted file mode 100644
index 82e34746f..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-plugins-executor-dir}/site-docs/adoc/fragments/executors.adoc[]
-
-include::{adsite-plugins-executor-javascript-dir}/site-docs/adoc/fragments/javascript-config.adoc[leveloffset=+1]
-
-include::{adsite-plugins-executor-jython-dir}/site-docs/adoc/fragments/jython-config.adoc[leveloffset=+1]
-
-include::{adsite-plugins-executor-jruby-dir}/site-docs/adoc/fragments/jruby-config.adoc[leveloffset=+1]
-
-include::{adsite-plugins-executor-java-dir}/site-docs/adoc/fragments/java-config.adoc[leveloffset=+1]
-
-include::{adsite-plugins-executor-mvel-dir}/site-docs/adoc/fragments/mvel-config.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-05-context.adoc b/src/site/asciidoc/user-manual/configuration/um-05-context.adoc
deleted file mode 100644
index 099639d27..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-05-context.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-plugins-context-dir}/site-docs/adoc/fragments/context.adoc[]
-
-include::{adsite-plugins-context-schema-avro-dir}/site-docs/adoc/fragments/ctx-schema-avro-config.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc b/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc
deleted file mode 100644
index 316d88d3e..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/carriertech.adoc[]
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-standard-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-file-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-eventrequestor-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-kafka-dir}/site-docs/adoc/fragments/ct-kafka-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-jms-dir}/site-docs/adoc/fragments/ct-jms-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ct-websocket-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-restclient-dir}/site-docs/adoc/fragments/ct-restclient-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-restserver-dir}/site-docs/adoc/fragments/ct-restserver-io.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-carrier-restrequestor-dir}/site-docs/adoc/fragments/ct-restrequestor-io.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc b/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc
deleted file mode 100644
index cdb0df80c..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/event-protocols.adoc[]
-
-include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/ep-json.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/ep-apex.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-protocol-jms-dir}/site-docs/adoc/fragments/ep-jms.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-protocol-yaml-dir}/site-docs/adoc/fragments/ep-yaml.adoc[leveloffset=+1]
-
-include::{adsite-plugins-event-protocol-xml-dir}/site-docs/adoc/fragments/ep-xml.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc b/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc
deleted file mode 100644
index d429d2fb6..000000000
--- a/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-example.adoc[] \ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc
deleted file mode 100644
index 92fd5e727..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-model-2-cli.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc
deleted file mode 100644
index 4d25f91f3..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-tpl-event-json.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc
deleted file mode 100644
index 87c8e1ae3..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-ws.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc
deleted file mode 100644
index 6211e5207..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/application-launcher.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc
deleted file mode 100644
index c5cfbcc22..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/cli-editor.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc
deleted file mode 100644
index 1b1a51ebd..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/eng-deployment.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc
deleted file mode 100644
index 20482b9ec..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/eng-monitoring.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc
deleted file mode 100644
index 25e92d82f..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/engine.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc
deleted file mode 100644
index a192c9c35..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/full-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc
deleted file mode 100644
index c9534c529..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/rest-editor.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc
deleted file mode 100644
index 96865c597..000000000
--- a/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc b/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc
deleted file mode 100644
index e69caf531..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/build-apex.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-configure.adoc b/src/site/asciidoc/user-manual/install/um-install-configure.adoc
deleted file mode 100644
index fa5a6dfc7..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-configure.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/configure.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-docker.adoc b/src/site/asciidoc/user-manual/install/um-install-docker.adoc
deleted file mode 100644
index 7552fddd7..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-docker.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/docker.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-get-source.adoc b/src/site/asciidoc/user-manual/install/um-install-get-source.adoc
deleted file mode 100644
index c53f3eee1..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-get-source.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/get-source.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-install.adoc b/src/site/asciidoc/user-manual/install/um-install-install.adoc
deleted file mode 100644
index f3fff1d7a..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-install.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-layout.adoc b/src/site/asciidoc/user-manual/install/um-install-layout.adoc
deleted file mode 100644
index 2f473edab..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-layout.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/layout.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-verify.adoc b/src/site/asciidoc/user-manual/install/um-install-verify.adoc
deleted file mode 100644
index 0f6e8022c..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-verify.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/verify.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-wars.adoc b/src/site/asciidoc/user-manual/install/um-install-wars.adoc
deleted file mode 100644
index 1640bc957..000000000
--- a/src/site/asciidoc/user-manual/install/um-install-wars.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-wars.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install.adoc b/src/site/asciidoc/user-manual/install/um-install.adoc
deleted file mode 100644
index b70434d2e..000000000
--- a/src/site/asciidoc/user-manual/install/um-install.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/requirements.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc b/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc
deleted file mode 100644
index 340e843b7..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/example-logic.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc b/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc
deleted file mode 100644
index 2b732c002..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/example-server.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc
deleted file mode 100644
index b00e8832d..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logback-status.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc
deleted file mode 100644
index fd49e246f..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logging-3pps.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc
deleted file mode 100644
index ca2ab11e2..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logging-policy-logic.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc b/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc
deleted file mode 100644
index 21661198d..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/rolling-file-appenders.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc b/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc
deleted file mode 100644
index 2ec3b2894..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/standard-configuration.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging.adoc b/src/site/asciidoc/user-manual/logging/um-logging.adoc
deleted file mode 100644
index c4a81005f..000000000
--- a/src/site/asciidoc/user-manual/logging/um-logging.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc
deleted file mode 100644
index 83fe34043..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-= HowTo: My First Policy
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/01-introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc
deleted file mode 100644
index dca728dfa..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/02-data-models.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc
deleted file mode 100644
index 2bf3aa44c..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/03-policy-step1.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc
deleted file mode 100644
index c3f05c5b0..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/031-s1-new-model.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc
deleted file mode 100644
index 044c21ecd..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/032-s1-new-events.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc
deleted file mode 100644
index d7d279b3d..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/033-s1-new-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc
deleted file mode 100644
index 43a026a4c..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/034-s1-test-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc
deleted file mode 100644
index 2c3063055..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/035-s1-clieditor.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc
deleted file mode 100644
index 155c888e5..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/04-policy-step2.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc
deleted file mode 100644
index d2b4a9952..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/041-s2-extend-model.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc
deleted file mode 100644
index 454fee841..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/042-s2-test-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc
deleted file mode 100644
index ca39675c5..000000000
--- a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/043-s2-clieditor.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc
deleted file mode 100644
index 20bb791e8..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-00.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc
deleted file mode 100644
index 97187768f..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-01-vpn-wsconfig.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc
deleted file mode 100644
index ea6250263..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-02-start-engine.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc
deleted file mode 100644
index e55c437ad..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-03-start-echo-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc
deleted file mode 100644
index fe0c2dd8e..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-04-start-console-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc
deleted file mode 100644
index c2d541e1d..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-05-send-events.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc
deleted file mode 100644
index bfa111b35..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/engine-config-bcp.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc
deleted file mode 100644
index d230c51bc..000000000
--- a/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// ============LICENSE_START=======================================================
-// Copyright (C) 2016-2018 Ericsson. All rights reserved.
-// ================================================================================
-// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
-// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
-//
-// SPDX-License-Identifier: CC-BY-4.0
-// ============LICENSE_END=========================================================
-//
-// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
-//
-
-= HowTo: Building an APEX System with Websockets
-
-include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-intro.adoc[]
-
-include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-java.adoc[]
-
-include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-foss.adoc[]
-