Merge "Remove old documentation from build"

536 files changed, 0 insertions, 16583 deletions

diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml
index 777a7766e..4bd94c237 100644
--- a/auth/cli-codegen/pom.xml
+++ b/auth/cli-codegen/pom.xml
@@ -45,21 +45,4 @@
         </dependency>
 
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/auth/cli-codegen/src/site/css/site.css b/auth/cli-codegen/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/auth/cli-codegen/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/auth/cli-codegen/src/site/images/logos.png b/auth/cli-codegen/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/auth/cli-codegen/src/site/images/logos.png
+++ /dev/null
diff --git a/auth/cli-codegen/src/site/site.xml b/auth/cli-codegen/src/site/site.xml
deleted file mode 100644
index 2fb400593..000000000
--- a/auth/cli-codegen/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Auth Codegen">
-    <body>
-        <menu name="APEX Auth Codegen">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Codegen" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml
index 25d6c91a5..079817b32 100644
--- a/auth/cli-editor/pom.xml
+++ b/auth/cli-editor/pom.xml
@@ -53,21 +53,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/auth/cli-editor/src/site/css/site.css b/auth/cli-editor/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/auth/cli-editor/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/auth/cli-editor/src/site/images/logos.png b/auth/cli-editor/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/auth/cli-editor/src/site/images/logos.png
+++ /dev/null
diff --git a/auth/cli-editor/src/site/site.xml b/auth/cli-editor/src/site/site.xml
deleted file mode 100644
index 223402a9b..000000000
--- a/auth/cli-editor/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Auth Cli Editor">
-    <body>
-        <menu name="APEX Auth Cli Editor">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Cli Editor" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/auth/pom.xml b/auth/pom.xml
index a60bb6dba..b0ddf2e9b 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -36,21 +36,4 @@
         <module>cli-editor</module>
         <module>cli-codegen</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/auth/src/site/css/site.css b/auth/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/auth/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/auth/src/site/images/logos.png b/auth/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/auth/src/site/images/logos.png
+++ /dev/null
diff --git a/auth/src/site/site.xml b/auth/src/site/site.xml
deleted file mode 100644
index 10b5a5140..000000000
--- a/auth/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Auth">
-    <body>
-        <menu name="APEX Authoring">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Auth" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/client-common/pom.xml b/client/client-common/pom.xml
index beff6c57b..4072c124a 100644
--- a/client/client-common/pom.xml
+++ b/client/client-common/pom.xml
@@ -54,24 +54,5 @@
                 </executions>
             </plugin>
         </plugins>
-
-
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/client/client-common/src/site/css/site.css b/client/client-common/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/client-common/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/client-common/src/site/images/logos.png b/client/client-common/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/client-common/src/site/images/logos.png
+++ /dev/null
diff --git a/client/client-common/src/site/site.xml b/client/client-common/src/site/site.xml
deleted file mode 100644
index 452e77e9d..000000000
--- a/client/client-common/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client Common">
-    <body>
-        <menu name="APEX Client Common">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Common" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml
index 91d8f56fc..ab7d22fcf 100644
--- a/client/client-deployment/pom.xml
+++ b/client/client-deployment/pom.xml
@@ -135,21 +135,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/client/client-deployment/src/site/css/site.css b/client/client-deployment/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/client-deployment/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/client-deployment/src/site/images/logos.png b/client/client-deployment/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/client-deployment/src/site/images/logos.png
+++ /dev/null
diff --git a/client/client-deployment/src/site/site.xml b/client/client-deployment/src/site/site.xml
deleted file mode 100644
index aeb592ea6..000000000
--- a/client/client-deployment/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client Deployment">
-    <body>
-        <menu name="APEX Client Deployment">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Deployment" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml
index ace0c1042..4a5dcb474 100644
--- a/client/client-editor/pom.xml
+++ b/client/client-editor/pom.xml
@@ -167,21 +167,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/client/client-editor/src/site/css/site.css b/client/client-editor/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/client-editor/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/client-editor/src/site/images/logos.png b/client/client-editor/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/client-editor/src/site/images/logos.png
+++ /dev/null
diff --git a/client/client-editor/src/site/site.xml b/client/client-editor/src/site/site.xml
deleted file mode 100644
index e8c9b868f..000000000
--- a/client/client-editor/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client Editor">
-    <body>
-        <menu name="APEX Client Editor">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Editor" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml
index 1a623d84f..0f3842769 100644
--- a/client/client-full/pom.xml
+++ b/client/client-full/pom.xml
@@ -242,20 +242,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/client/client-full/src/site/css/site.css b/client/client-full/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/client-full/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/client-full/src/site/images/logos.png b/client/client-full/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/client-full/src/site/images/logos.png
+++ /dev/null
diff --git a/client/client-full/src/site/site.xml b/client/client-full/src/site/site.xml
deleted file mode 100644
index 044a76667..000000000
--- a/client/client-full/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client Full">
-    <body>
-        <menu name="APEX Client Full">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules"/>
-
-        <breadcrumbs>
-            <item name="Full" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml
index 7ac59ee56..91c136310 100644
--- a/client/client-monitoring/pom.xml
+++ b/client/client-monitoring/pom.xml
@@ -130,21 +130,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/client/client-monitoring/src/site/css/site.css b/client/client-monitoring/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/client-monitoring/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/client-monitoring/src/site/images/logos.png b/client/client-monitoring/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/client-monitoring/src/site/images/logos.png
+++ /dev/null
diff --git a/client/client-monitoring/src/site/site.xml b/client/client-monitoring/src/site/site.xml
deleted file mode 100644
index d3a31d2bf..000000000
--- a/client/client-monitoring/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client Monitoring">
-    <body>
-        <menu name="APEX Client Monitoring">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Monitoring" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/client/pom.xml b/client/pom.xml
index 16dee1158..a681da785 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -39,21 +39,4 @@
         <module>client-editor</module>
         <module>client-full</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/client/src/site/css/site.css b/client/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/client/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/client/src/site/images/logos.png b/client/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/client/src/site/images/logos.png
+++ /dev/null
diff --git a/client/src/site/site.xml b/client/src/site/site.xml
deleted file mode 100644
index b93c14b48..000000000
--- a/client/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Client">
-    <body>
-        <menu name="APEX Client">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Client" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml
index 71765f944..0c2f27d9e 100644
--- a/context/context-management/pom.xml
+++ b/context/context-management/pom.xml
@@ -49,21 +49,4 @@
             <artifactId>gson</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/context/context-management/src/site/css/site.css b/context/context-management/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/context/context-management/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/context/context-management/src/site/images/logos.png b/context/context-management/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/context/context-management/src/site/images/logos.png
+++ /dev/null
diff --git a/context/context-management/src/site/site.xml b/context/context-management/src/site/site.xml
deleted file mode 100644
index 670023ab4..000000000
--- a/context/context-management/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Context Management">
-    <body>
-        <menu name="APEX Context Management">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Context Management" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/context/pom.xml b/context/pom.xml
index bdfa3e4b7..cdecfd747 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -36,21 +36,4 @@
     <modules>
         <module>context-management</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/context/src/site/css/site.css b/context/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/context/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/context/src/site/images/logos.png b/context/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/context/src/site/images/logos.png
+++ /dev/null
diff --git a/context/src/site/site.xml b/context/src/site/site.xml
deleted file mode 100644
index ad4825512..000000000
--- a/context/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Context">
-    <body>
-        <menu name="APEX Context">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Context" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/core/core-deployment/pom.xml b/core/core-deployment/pom.xml
index 713eed13b..a844f5354 100644
--- a/core/core-deployment/pom.xml
+++ b/core/core-deployment/pom.xml
@@ -56,21 +56,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/core-deployment/src/site/css/site.css b/core/core-deployment/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/core/core-deployment/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/core/core-deployment/src/site/images/logos.png b/core/core-deployment/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/core/core-deployment/src/site/images/logos.png
+++ /dev/null
diff --git a/core/core-deployment/src/site/site.xml b/core/core-deployment/src/site/site.xml
deleted file mode 100644
index 9a59cbeb3..000000000
--- a/core/core-deployment/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Core Deployment">
-    <body>
-        <menu name="APEX Core Deployment">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Deployment" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/core/core-engine/pom.xml b/core/core-engine/pom.xml
index 0248c44c6..03297af39 100644
--- a/core/core-engine/pom.xml
+++ b/core/core-engine/pom.xml
@@ -69,21 +69,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/core-engine/src/site/css/site.css b/core/core-engine/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/core/core-engine/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/core/core-engine/src/site/images/logos.png b/core/core-engine/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/core/core-engine/src/site/images/logos.png
+++ /dev/null
diff --git a/core/core-engine/src/site/site.xml b/core/core-engine/src/site/site.xml
deleted file mode 100644
index d2430f14e..000000000
--- a/core/core-engine/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Core Engine">
-    <body>
-        <menu name="APEX Core Engine">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Engine" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/core/core-infrastructure/pom.xml b/core/core-infrastructure/pom.xml
index df4b19edd..c62611760 100644
--- a/core/core-infrastructure/pom.xml
+++ b/core/core-infrastructure/pom.xml
@@ -48,21 +48,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/core-infrastructure/src/site/css/site.css b/core/core-infrastructure/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/core/core-infrastructure/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/core/core-infrastructure/src/site/images/logos.png b/core/core-infrastructure/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/core/core-infrastructure/src/site/images/logos.png
+++ /dev/null
diff --git a/core/core-infrastructure/src/site/site.xml b/core/core-infrastructure/src/site/site.xml
deleted file mode 100644
index f1b745fd5..000000000
--- a/core/core-infrastructure/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Core Infrastructure">
-    <body>
-        <menu name="APEX Core Infrastructure">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Infrastructure" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/core/core-protocols/pom.xml b/core/core-protocols/pom.xml
index db40268e8..67ac99973 100644
--- a/core/core-protocols/pom.xml
+++ b/core/core-protocols/pom.xml
@@ -36,21 +36,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/core-protocols/src/site/css/site.css b/core/core-protocols/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/core/core-protocols/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/core/core-protocols/src/site/images/logos.png b/core/core-protocols/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/core/core-protocols/src/site/images/logos.png
+++ /dev/null
diff --git a/core/core-protocols/src/site/site.xml b/core/core-protocols/src/site/site.xml
deleted file mode 100644
index ba0271e27..000000000
--- a/core/core-protocols/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Core Protocols">
-    <body>
-        <menu name="APEX Core Protocols">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Protocols" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 4782f5a5c..77b3936d1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -38,21 +38,4 @@
         <module>core-engine</module>
         <module>core-deployment</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/core/src/site/css/site.css b/core/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/core/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/core/src/site/images/logos.png b/core/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/core/src/site/images/logos.png
+++ /dev/null
diff --git a/core/src/site/site.xml b/core/src/site/site.xml
deleted file mode 100644
index b83d4a288..000000000
--- a/core/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Core">
-    <body>
-        <menu name="APEX Core">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Core" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index 27a8509d6..20b45944d 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -82,21 +82,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-aadm/src/site/css/site.css b/examples/examples-aadm/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-aadm/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-aadm/src/site/images/logos.png b/examples/examples-aadm/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-aadm/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-aadm/src/site/site.xml b/examples/examples-aadm/src/site/site.xml
deleted file mode 100644
index 281fbc2ea..000000000
--- a/examples/examples-aadm/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples AADM">
-    <body>
-        <menu name="APEX Examples AADM">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="AADM" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index c936d09ea..3cd580ec1 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -92,21 +92,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-adaptive/src/site/css/site.css b/examples/examples-adaptive/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-adaptive/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-adaptive/src/site/images/logos.png b/examples/examples-adaptive/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-adaptive/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-adaptive/src/site/site.xml b/examples/examples-adaptive/src/site/site.xml
deleted file mode 100644
index 38b71fe1b..000000000
--- a/examples/examples-adaptive/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples Adaptive">
-    <body>
-        <menu name="APEX Examples Adaptive">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Adaptive" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index 8fd66959a..59e010339 100644
--- a/examples/examples-decisionmaker/pom.xml
+++ b/examples/examples-decisionmaker/pom.xml
@@ -110,24 +110,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-decisionmaker-dir>${project.basedir}/src</adsite-examples-decisionmaker-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.adoc
deleted file mode 100644
index 65eae44bd..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitTask.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-decisionmaker-dir}/site-docs/adoc/fragments/AnswerInitTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.adoc b/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.adoc
deleted file mode 100644
index bf92e0f95..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/AnswerInitiationEvents.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-decisionmaker-dir}/site-docs/adoc/fragments/AnswerInitiationEvents.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.adoc b/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.adoc
deleted file mode 100644
index 82edf2a9a..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTClient.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-decisionmaker-dir}/site-docs/adoc/fragments/ApexConfigRESTClient.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.adoc b/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.adoc
deleted file mode 100644
index 3b3609a54..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/ApexConfigRESTServer.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-decisionmaker-dir}/site-docs/adoc/fragments/ApexConfigRESTServer.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.adoc b/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.adoc
deleted file mode 100644
index 30c65ba4a..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/DecisionMakerPolicyModel.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-decisionmaker-dir}/site-docs/adoc/fragments/DecisionMakerPolicyModel.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.adoc
deleted file mode 100644
index 3a6b03c67..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/DitheringAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/DitheringAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Client.adoc
deleted file mode 100644
index 9271a7c74..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_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-examples-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionExtraMode_Client.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_Server.adoc
deleted file mode 100644
index c00131280..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionExtraMode_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-examples-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionExtraMode_Server.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.adoc
deleted file mode 100644
index ec45f45ee..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecisionStateTSL.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-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecisionStateTSL.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Client.adoc
deleted file mode 100644
index 19999abf9..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_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-examples-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecision_Client.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.adoc b/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_Server.adoc
deleted file mode 100644
index cf45fead6..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/MakeDecision_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-examples-decisionmaker-dir}/site-docs/adoc/fragments/MakeDecision_Server.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.adoc
deleted file mode 100644
index 4bc4e4f07..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/OptimisticAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/OptimisticAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.adoc
deleted file mode 100644
index 2a252b326..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/PessimisticAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/PessimisticAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.adoc
deleted file mode 100644
index d63d41176..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/RandomAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/RandomAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.adoc b/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.adoc
deleted file mode 100644
index ddb789dc9..000000000
--- a/examples/examples-decisionmaker/src/site/asciidoc/RoundRobinAnswerTask.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-decisionmaker-dir}/site-docs/adoc/fragments/RoundRobinAnswerTask.adoc[]
diff --git a/examples/examples-decisionmaker/src/site/css/site.css b/examples/examples-decisionmaker/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-decisionmaker/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-decisionmaker/src/site/images/logos.png b/examples/examples-decisionmaker/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-decisionmaker/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-decisionmaker/src/site/site.xml b/examples/examples-decisionmaker/src/site/site.xml
deleted file mode 100644
index d65f22ee5..000000000
--- a/examples/examples-decisionmaker/src/site/site.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples Decision Maker">
-    <body>
-        <menu name="APEX Examples Decision Maker">
-            <item href="ApexConfigRESTClient.html" name="Config: REST Client" />
-            <item href="ApexConfigRESTServer.html" name="Config: REST Server" />
-            <item href="AnswerInitiationEvents.html" name="Inititation Events" />
-            <item href="MakeDecision_Client.html" name="HTML Client" />
-            <item href="MakeDecision_Server.html" name="HTML Server" />
-            <item href="MakeDecisionExtraMode_Client.html" name="HTML Client (Extra)" />
-            <item href="MakeDecisionExtraMode_Server.html" name="HTML Server (Extra)" />
-            <item href="DecisionMakerPolicyModel.html" name="APEX Model (Policy)"
-                collapse="true">
-                <item href="AnswerInitTask.html" name="Task Logic: Answer Init" />
-                <item href="DitheringAnswerTask.html" name="Task Logic: Dithering Answer" />
-                <item href="MakeDecisionStateTSL.html" name="Task Selection Logic: Make Decision State" />
-                <item href="OptimisticAnswerTask.html" name="Task Logic: Optimistic Answer" />
-                <item href="PessimisticAnswerTask.html" name="Task Logic: Pessimistic Answer" />
-                <item href="RandomAnswerTask.html" name="Task Logic: Random Answer" />
-                <item href="RoundRobinAnswerTask.html" name="Task Logic: RoundRobin Answer" />
-            </item>
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Decision Maker" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index ead8803bb..14edad4ec 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -180,56 +180,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>apexSite</id>
-      <activation>
-        <property>
-          <name>apexSite</name>
-        </property>
-      </activation>
-      <properties>
-        <adsite-examples-myfirstpolicy-dir>${project.basedir}/src
-        </adsite-examples-myfirstpolicy-dir>
-      </properties>
-      <distributionManagement>
-        <site>
-          <id>${project.artifactId}-site</id>
-          <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/
-          </url>
-        </site>
-      </distributionManagement>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>3.0.2</version>
-            <executions>
-              <execution>
-                <id>copy-domain-mfp-images</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <resources>
-                    <resource>
-                      <directory>${project.basedir}/src/site-docs/adoc/resources/images</directory>
-                      <includes>
-                        <include>**/*.jpg</include>
-                        <include>**/*.png</include>
-                      </includes>
-                    </resource>
-                  </resources>
-                  <outputDirectory>${project.build.directory}/site/images</outputDirectory>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/02-data-models.adoc
deleted file mode 100644
index dca728dfa..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/03-policy-step1.adoc
deleted file mode 100644
index 2bf3aa44c..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/031-s1-new-model.adoc
deleted file mode 100644
index c3f05c5b0..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/032-s1-new-events.adoc
deleted file mode 100644
index 044c21ecd..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/033-s1-new-policy.adoc
deleted file mode 100644
index d7d279b3d..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/034-s1-test-policy.adoc
deleted file mode 100644
index 43a026a4c..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/035-s1-clieditor.adoc
deleted file mode 100644
index 2c3063055..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/04-policy-step2.adoc
deleted file mode 100644
index 155c888e5..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/041-s2-extend-model.adoc
deleted file mode 100644
index d2b4a9952..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/042-s2-test-policy.adoc
deleted file mode 100644
index 454fee841..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/043-s2-clieditor.adoc
deleted file mode 100644
index ca39675c5..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/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/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc b/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.adoc
deleted file mode 100644
index 83fe34043..000000000
--- a/examples/examples-myfirstpolicy/src/site/asciidoc/MyFirstPolicyHowto.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/examples/examples-myfirstpolicy/src/site/css/site.css b/examples/examples-myfirstpolicy/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-myfirstpolicy/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-myfirstpolicy/src/site/images/logos.png b/examples/examples-myfirstpolicy/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-myfirstpolicy/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-myfirstpolicy/src/site/site.xml b/examples/examples-myfirstpolicy/src/site/site.xml
deleted file mode 100644
index 4dae4202a..000000000
--- a/examples/examples-myfirstpolicy/src/site/site.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples My First Policy">
-    <body>
-        <menu name="APEX Examples My First Policy">
-            <item href="MyFirstPolicyHowto.html" name="HowTo: My First Policy"
-                collapse="true">
-                <item href="02-data-models.html" name="Data Models" />
-                <item href="03-policy-step1.html" name="Policy Step 1">
-                    <item href="031-s1-new-model.html" name="New Policy Model" />
-                    <item href="032-s1-new-events.html" name="Events" />
-                    <item href="033-s1-new-policy.html" name="New Policy" />
-                    <item href="034-s1-test-policy.html" name="Test the Policy" />
-                    <item href="035-s1-clieditor.html" name="CLI Editor File" />
-                </item>
-                <item href="04-policy-step2.html" name="Policy Step 2">
-                    <item href="041-s2-extend-model.html" name="Extend Policy Model" />
-                    <item href="042-s2-test-policy.html" name="Test the Policy" />
-                    <item href="043-s2-clieditor.html" name="CLI Editor File" />
-                </item>
-            </item>
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="My First Policy" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml
index ccee03b7a..1f9d3407c 100644
--- a/examples/examples-onap-bbs/pom.xml
+++ b/examples/examples-onap-bbs/pom.xml
@@ -119,24 +119,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-onap-bbs-dir>${project.basedir}/src</adsite-examples-onap-bbs-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-onap-bbs/src/site/css/site.css b/examples/examples-onap-bbs/src/site/css/site.css
deleted file mode 100644
index 92ddec619..000000000
--- a/examples/examples-onap-bbs/src/site/css/site.css
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Copyright (C) 2019 Huawei. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-onap-bbs/src/site/images/logos.png b/examples/examples-onap-bbs/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-onap-bbs/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-onap-bbs/src/site/site.xml b/examples/examples-onap-bbs/src/site/site.xml
deleted file mode 100644
index 9e14cadfe..000000000
--- a/examples/examples-onap-bbs/src/site/site.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. All rights reserved.
-   Copyright (C) 2019 Huawei. 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=========================================================
-
--->
-
-<project name="APEX Examples ONAP BBS">
-    <body>
-        <menu name="APEX Examples ONAP BBS">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="ONAP BBS" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index b6a1876a2..2e3ba979e 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -177,24 +177,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-onap-vcpe-dir>${project.basedir}/src</adsite-examples-onap-vcpe-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-onap-vcpe/src/site/css/site.css b/examples/examples-onap-vcpe/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-onap-vcpe/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-onap-vcpe/src/site/images/logos.png b/examples/examples-onap-vcpe/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-onap-vcpe/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-onap-vcpe/src/site/site.xml b/examples/examples-onap-vcpe/src/site/site.xml
deleted file mode 100644
index f9808e698..000000000
--- a/examples/examples-onap-vcpe/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples ONAP vCPE">
-    <body>
-        <menu name="APEX Examples ONAP vCPE">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="ONAP vCPE" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-pcvs/pom.xml b/examples/examples-pcvs/pom.xml
index 61ed93c15..9ad46a259 100644
--- a/examples/examples-pcvs/pom.xml
+++ b/examples/examples-pcvs/pom.xml
@@ -104,54 +104,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-pcvs-dir>${project.basedir}/src</adsite-examples-pcvs-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-domain-pcvs-images</id>
-                                <phase>initialize</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/src/site-docs/adoc/resources/images</directory>
-                                            <includes>
-                                                <include>**/*.jpg</include>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/images</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-pcvs/src/site/asciidoc/install.adoc b/examples/examples-pcvs/src/site/asciidoc/install.adoc
deleted file mode 100644
index ea18374d9..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/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-examples-pcvs-dir}/site-docs/adoc/fragments/install.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/introduction.adoc b/examples/examples-pcvs/src/site/asciidoc/introduction.adoc
deleted file mode 100644
index e22dc3f2d..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/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)
-//
-
-== Policy-controlled Video Streaming (pcvs) with APEX
-
-include::{adsite-examples-pcvs-dir}/site-docs/adoc/fragments/introduction.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla.adoc
deleted file mode 100644
index 92d9037a2..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.adoc
deleted file mode 100644
index 02976d3ed..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-ctxt.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-ctxt.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.adoc
deleted file mode 100644
index 34bdee8fa..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-internal.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-internal.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.adoc
deleted file mode 100644
index 8f015d0fd..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/avro-trigger.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/avro-trigger.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.adoc
deleted file mode 100644
index c5733789e..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/cli-spec.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/cli-spec.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.adoc
deleted file mode 100644
index 3a5dda657..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-customers.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-customers.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.adoc
deleted file mode 100644
index 14f569303..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-edges.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-edges.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.adoc
deleted file mode 100644
index 7571dad3b..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-events-nodes.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-events-nodes.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.adoc
deleted file mode 100644
index 9acb06a58..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-customer.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-customer.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.adoc
deleted file mode 100644
index 5d8a8ddc3..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-edges.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-edges.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.adoc
deleted file mode 100644
index 207e37700..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/ctxt-logic-nodes.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/ctxt-logic-nodes.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.adoc
deleted file mode 100644
index c5727383f..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/events-trigger.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/events-trigger.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.adoc
deleted file mode 100644
index 0aac08fcf..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-act.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-act.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.adoc
deleted file mode 100644
index 1a9f228c5..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-none.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-none.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.adoc
deleted file mode 100644
index 8b672f194..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-priority.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-priority.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.adoc
deleted file mode 100644
index 84173e125..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-sla.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-sla.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.adoc
deleted file mode 100644
index 60fc26884..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide-solved.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide-solved.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.adoc
deleted file mode 100644
index 1e4d6e5c3..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-decide.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-decide.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.adoc
deleted file mode 100644
index a2f0b33db..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-establish.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-establish.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.adoc
deleted file mode 100644
index 2f4842a05..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/logic-match.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/logic-match.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/policy.adoc
deleted file mode 100644
index a2bf5a7a0..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/policy.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.adoc
deleted file mode 100644
index 600caa763..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-linkmonitor.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/python-linkmonitor.adoc[]
diff --git a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.adoc b/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.adoc
deleted file mode 100644
index 925ae3eca..000000000
--- a/examples/examples-pcvs/src/site/asciidoc/vpnsla/python-mininet.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-pcvs-dir}/site-docs/adoc/fragments/vpnsla/python-mininet.adoc[]
diff --git a/examples/examples-pcvs/src/site/css/site.css b/examples/examples-pcvs/src/site/css/site.css
deleted file mode 100644
index 67baa6d52..000000000
--- a/examples/examples-pcvs/src/site/css/site.css
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-pcvs/src/site/images/logos.png b/examples/examples-pcvs/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-pcvs/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-pcvs/src/site/site.xml b/examples/examples-pcvs/src/site/site.xml
deleted file mode 100644
index ddfd850cd..000000000
--- a/examples/examples-pcvs/src/site/site.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples PCVS">
-    <body>
-        <menu name="APEX Examples PCVS">
-            <item href="introduction.html" name="Introduction" />
-            <item href="install.html" name="Install Ubuntu Server and SW" />
-            <item href="vpnsla.html" name="VPN SLA Demo" />
-            <item href="vpnsla/policy.html" name="VPN SLA Policy" collapse="true">
-                <item href="vpnsla/avro-ctxt.html" name="Context Schemas" />
-                <item href="vpnsla/avro-internal.html" name="Internal Schemas" />
-                <item href="vpnsla/avro-trigger.html" name="Trigger Schema" />
-                <item href="vpnsla/ctxt-logic-nodes.html" name="Context Logic Nodes" />
-                <item href="vpnsla/ctxt-logic-edges.html" name="Context Logic Edges" />
-                <item href="vpnsla/ctxt-logic-customer.html" name="Context Logic Customers" />
-                <item href="vpnsla/logic-match.html" name="Logic: Match" />
-                <item href="vpnsla/logic-establish.html" name="Logic: Establish" />
-                <item href="vpnsla/logic-decide.html" name="Logic: Decide" />
-                <item href="vpnsla/logic-decide-none.html" name="Logic: Decide None" />
-                <item href="vpnsla/logic-decide-solved.html" name="Logic: Decide Solved" />
-                <item href="vpnsla/logic-decide-sla.html" name="Logic: Decide SLA" />
-                <item href="vpnsla/logic-decide-priority.html" name="Logic: Decide Priority" />
-                <item href="vpnsla/logic-act.html" name="Logic: Act" />
-                <item href="vpnsla/cli-spec.html" name="CLI Spec" />
-                <item href="vpnsla/ctxt-events-nodes.html" name="Context Events Nodes" />
-                <item href="vpnsla/ctxt-events-edges.html" name="Context Events Edges" />
-                <item href="vpnsla/ctxt-events-customers.html" name="Context Events Customers" />
-                <item href="vpnsla/events-trigger.html" name="Trigger Examples" />
-                <item href="vpnsla/python-linkmonitor.html" name="Link Monitor" />
-                <item href="vpnsla/python-mininet.html" name="Mininet Topology" />
-            </item>
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="pcvs" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index b4b591e71..dcbfd1084 100644
--- a/examples/examples-periodic/pom.xml
+++ b/examples/examples-periodic/pom.xml
@@ -70,24 +70,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-periodic-dir>${project.basedir}/src</adsite-examples-periodic-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-periodic/src/site/asciidoc/apex-configuration.adoc b/examples/examples-periodic/src/site/asciidoc/apex-configuration.adoc
deleted file mode 100644
index dd244807a..000000000
--- a/examples/examples-periodic/src/site/asciidoc/apex-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-examples-periodic-dir}/site-docs/adoc/fragments/apex-configuration.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/apex-model.adoc b/examples/examples-periodic/src/site/asciidoc/apex-model.adoc
deleted file mode 100644
index 4a25a7b0a..000000000
--- a/examples/examples-periodic/src/site/asciidoc/apex-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-periodic-dir}/site-docs/adoc/fragments/apex-model.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/logic-task-output.adoc b/examples/examples-periodic/src/site/asciidoc/logic-task-output.adoc
deleted file mode 100644
index 9418a817e..000000000
--- a/examples/examples-periodic/src/site/asciidoc/logic-task-output.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-periodic-dir}/site-docs/adoc/fragments/logic-task-output.adoc[]
diff --git a/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.adoc b/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.adoc
deleted file mode 100644
index eec55f1d1..000000000
--- a/examples/examples-periodic/src/site/asciidoc/logic-task-periodic.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-periodic-dir}/site-docs/adoc/fragments/logic-task-periodic.adoc[]
diff --git a/examples/examples-periodic/src/site/css/site.css b/examples/examples-periodic/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-periodic/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-periodic/src/site/images/logos.png b/examples/examples-periodic/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-periodic/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-periodic/src/site/site.xml b/examples/examples-periodic/src/site/site.xml
deleted file mode 100644
index 56e2bda3c..000000000
--- a/examples/examples-periodic/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples Periodic Policy">
-    <body>
-        <menu name="APEX Domains Periodic Policy">
-            <item href="apex-configuration.html" name="APEX Configuration" />
-            <item href="apex-model.html" name="APEX Model (Policy)" />
-            <item href="logic-task-output.html" name="Logic: Output Task" />
-            <item href="logic-task-periodic.html" name="Logic: Periodic Task" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Periodic Policy" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index 606876aa9..744293f6f 100644
--- a/examples/examples-servlet/pom.xml
+++ b/examples/examples-servlet/pom.xml
@@ -77,24 +77,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-examples-servlet-dir>${project.basedir}/src</adsite-examples-servlet-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/examples-servlet/src/site/css/site.css b/examples/examples-servlet/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/examples-servlet/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/examples-servlet/src/site/images/logos.png b/examples/examples-servlet/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/examples-servlet/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/examples-servlet/src/site/site.xml b/examples/examples-servlet/src/site/site.xml
deleted file mode 100644
index 156a8709b..000000000
--- a/examples/examples-servlet/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples Servlet">
-    <body>
-        <menu name="APEX Examples Servlet">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Servlet" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/examples/pom.xml b/examples/pom.xml
index 5c7c482e3..0faa70707 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -53,21 +53,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/examples/src/site/css/site.css b/examples/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/examples/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/examples/src/site/images/logos.png b/examples/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/examples/src/site/images/logos.png
+++ /dev/null
diff --git a/examples/src/site/site.xml b/examples/src/site/site.xml
deleted file mode 100644
index e58f71876..000000000
--- a/examples/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Examples">
-    <body>
-        <menu name="APEX Examples">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Examples" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/basic-model/pom.xml b/model/basic-model/pom.xml
index d12f223a2..32df977c2 100644
--- a/model/basic-model/pom.xml
+++ b/model/basic-model/pom.xml
@@ -107,21 +107,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/basic-model/src/site/css/site.css b/model/basic-model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/basic-model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/basic-model/src/site/images/logos.png b/model/basic-model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/basic-model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/basic-model/src/site/site.xml b/model/basic-model/src/site/site.xml
deleted file mode 100644
index 7a0ff6b12..000000000
--- a/model/basic-model/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Basic Model">
-    <body>
-        <menu name="APEX Model Basic Model">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Basic Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/context-model/pom.xml b/model/context-model/pom.xml
index 366516f72..7e74943ec 100644
--- a/model/context-model/pom.xml
+++ b/model/context-model/pom.xml
@@ -62,21 +62,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/context-model/src/site/css/site.css b/model/context-model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/context-model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/context-model/src/site/images/logos.png b/model/context-model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/context-model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/context-model/src/site/site.xml b/model/context-model/src/site/site.xml
deleted file mode 100644
index 8984203ae..000000000
--- a/model/context-model/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Context Model">
-    <body>
-        <menu name="APEX Model Context Model">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Context Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/engine-model/pom.xml b/model/engine-model/pom.xml
index de0b7135c..1f2196c5c 100644
--- a/model/engine-model/pom.xml
+++ b/model/engine-model/pom.xml
@@ -62,21 +62,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/engine-model/src/site/css/site.css b/model/engine-model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/engine-model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/engine-model/src/site/images/logos.png b/model/engine-model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/engine-model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/engine-model/src/site/site.xml b/model/engine-model/src/site/site.xml
deleted file mode 100644
index 35f6708b6..000000000
--- a/model/engine-model/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Engine Model">
-    <body>
-        <menu name="APEX Model Engine Model">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Engine Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/event-model/pom.xml b/model/event-model/pom.xml
index 81ac93426..abf7eb731 100644
--- a/model/event-model/pom.xml
+++ b/model/event-model/pom.xml
@@ -62,21 +62,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/event-model/src/site/css/site.css b/model/event-model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/event-model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/event-model/src/site/images/logos.png b/model/event-model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/event-model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/event-model/src/site/site.xml b/model/event-model/src/site/site.xml
deleted file mode 100644
index 2de09580c..000000000
--- a/model/event-model/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Event Model">
-    <body>
-        <menu name="APEX Model Event Model">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Event Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/model-api/pom.xml b/model/model-api/pom.xml
index 69137ca2d..dc4e0cd53 100644
--- a/model/model-api/pom.xml
+++ b/model/model-api/pom.xml
@@ -40,21 +40,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/model-api/src/site/css/site.css b/model/model-api/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/model-api/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/model-api/src/site/images/logos.png b/model/model-api/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/model-api/src/site/images/logos.png
+++ /dev/null
diff --git a/model/model-api/src/site/site.xml b/model/model-api/src/site/site.xml
deleted file mode 100644
index e79eb8edf..000000000
--- a/model/model-api/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-<project name="APEX Model API">
-    <body>
-        <menu name="APEX Model API">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="API" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/policy-model/pom.xml b/model/policy-model/pom.xml
index ff89069a0..35fd270db 100644
--- a/model/policy-model/pom.xml
+++ b/model/policy-model/pom.xml
@@ -76,21 +76,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/policy-model/src/site/css/site.css b/model/policy-model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/policy-model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/policy-model/src/site/images/logos.png b/model/policy-model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/policy-model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/policy-model/src/site/site.xml b/model/policy-model/src/site/site.xml
deleted file mode 100644
index 5643ec40f..000000000
--- a/model/policy-model/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Policy Model">
-    <body>
-        <menu name="APEX Model Policy Model">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Policy Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/pom.xml b/model/pom.xml
index aa9032444..655f74fb7 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -49,21 +49,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/src/site/css/site.css b/model/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/src/site/images/logos.png b/model/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/src/site/images/logos.png
+++ /dev/null
diff --git a/model/src/site/site.xml b/model/src/site/site.xml
deleted file mode 100644
index 4fbada21d..000000000
--- a/model/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model">
-    <body>
-        <menu name="APEX Model">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Model" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml
index a2988584d..42f407b49 100644
--- a/model/utilities/pom.xml
+++ b/model/utilities/pom.xml
@@ -46,21 +46,4 @@
             <artifactId>gson</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/model/utilities/src/site/css/site.css b/model/utilities/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/model/utilities/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/model/utilities/src/site/images/logos.png b/model/utilities/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/model/utilities/src/site/images/logos.png
+++ /dev/null
diff --git a/model/utilities/src/site/site.xml b/model/utilities/src/site/site.xml
deleted file mode 100644
index 740099e4a..000000000
--- a/model/utilities/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Model Utilities">
-    <body>
-        <menu name="APEX Model Utilities">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Utilities" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 99d739f79..291cab3bf 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -160,23 +160,4 @@
             <type>tar.gz</type>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-packages-docker-dir>${project.basedir}/src</adsite-packages-docker-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc b/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.adoc
deleted file mode 100755
index 5c3ffb57a..000000000
--- a/packages/apex-pdp-docker/src/site/asciidoc/dockerfile.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-packages-docker-dir}/site-docs/adoc/fragments/dockerfile.adoc[]
diff --git a/packages/apex-pdp-docker/src/site/css/site.css b/packages/apex-pdp-docker/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/packages/apex-pdp-docker/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/packages/apex-pdp-docker/src/site/images/logos.png b/packages/apex-pdp-docker/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/packages/apex-pdp-docker/src/site/images/logos.png
+++ /dev/null
diff --git a/packages/apex-pdp-docker/src/site/site.xml b/packages/apex-pdp-docker/src/site/site.xml
deleted file mode 100644
index ee59d8a00..000000000
--- a/packages/apex-pdp-docker/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Packages Docker">
-    <body>
-        <menu name="APEX Packages Docker">
-            <item href="dockerfile.html" name="APEX Dockerfile" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Docker" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index efa2d44a3..7c22a7368 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -616,20 +616,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/packages/apex-pdp-package-full/src/site/css/site.css b/packages/apex-pdp-package-full/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/packages/apex-pdp-package-full/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/packages/apex-pdp-package-full/src/site/images/logos.png b/packages/apex-pdp-package-full/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/packages/apex-pdp-package-full/src/site/images/logos.png
+++ /dev/null
diff --git a/packages/apex-pdp-package-full/src/site/site.xml b/packages/apex-pdp-package-full/src/site/site.xml
deleted file mode 100644
index 9142c4aba..000000000
--- a/packages/apex-pdp-package-full/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Packages Full">
-    <body>
-        <menu name="APEX Packages Full">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Full" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/packages/pom.xml b/packages/pom.xml
index 919efa5eb..26c481b00 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -35,20 +35,6 @@
 
     <profiles>
         <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-        <profile>
             <id>default</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
diff --git a/packages/src/site/css/site.css b/packages/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/packages/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/packages/src/site/images/logos.png b/packages/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/packages/src/site/images/logos.png
+++ /dev/null
diff --git a/packages/src/site/site.xml b/packages/src/site/site.xml
deleted file mode 100644
index 2d7c96246..000000000
--- a/packages/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Packages">
-    <body>
-        <menu name="APEX Packages">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Packages" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index 2a0e5ba55..70a01e50f 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -36,21 +36,4 @@
             <version>${version.hazelcast}</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-context/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/css/site.css b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/images/logos.png b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/site.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/site.xml
deleted file mode 100644
index 8e6bcc5ac..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Distribution Hazelcast">
-    <body>
-        <menu name="APEX Plugins Context Distribution Hazelcast">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Hazelcast" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index bf37f7b04..8c08950bc 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -43,22 +43,5 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-context/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
 
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/css/site.css b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/images/logos.png b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/site.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/site.xml
deleted file mode 100644
index cf4b462e0..000000000
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Distribution Infinispan">
-    <body>
-        <menu name="APEX Plugins Context Distribution Infinispan">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Infinispan" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml
index eb67a27ce..d4591b671 100644
--- a/plugins/plugins-context/plugins-context-distribution/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/pom.xml
@@ -37,21 +37,4 @@
         <module>plugins-context-distribution-hazelcast</module>
         <module>plugins-context-distribution-infinispan</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-distribution/src/site/css/site.css b/plugins/plugins-context/plugins-context-distribution/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-distribution/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-distribution/src/site/images/logos.png b/plugins/plugins-context/plugins-context-distribution/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-distribution/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-distribution/src/site/site.xml b/plugins/plugins-context/plugins-context-distribution/src/site/site.xml
deleted file mode 100644
index e597ca49a..000000000
--- a/plugins/plugins-context/plugins-context-distribution/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Distribution">
-    <body>
-        <menu name="APEX Plugins Context Distribution">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Distribution" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index 21a6a2be7..0a25cfc7c 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -76,21 +76,4 @@
             <artifactId>netty-all</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-context/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/css/site.css b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/images/logos.png b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/site.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/site.xml
deleted file mode 100644
index 9e8b638fc..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Locking Curator">
-    <body>
-        <menu name="APEX Plugins Context Locking Curator">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Curator" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
index f58fc5faf..53e331991 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
@@ -55,21 +55,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-context/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/css/site.css b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/images/logos.png b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/site.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/site.xml
deleted file mode 100644
index 72d410616..000000000
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Locking Hazelcast">
-    <body>
-        <menu name="APEX Plugins Context Locking Hazelcast">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Hazelcast" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml
index f3e40cd69..8f6da4cd9 100644
--- a/plugins/plugins-context/plugins-context-locking/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/pom.xml
@@ -35,21 +35,4 @@
         <module>plugins-context-locking-curator</module>
         <module>plugins-context-locking-hazelcast</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/plugins-context-locking/src/site/css/site.css b/plugins/plugins-context/plugins-context-locking/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-locking/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-locking/src/site/images/logos.png b/plugins/plugins-context/plugins-context-locking/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-locking/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-locking/src/site/site.xml b/plugins/plugins-context/plugins-context-locking/src/site/site.xml
deleted file mode 100644
index d81515cc8..000000000
--- a/plugins/plugins-context/plugins-context-locking/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Locking">
-    <body>
-        <menu name="APEX Plugins Context Locking">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Locking" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-persistence/pom.xml b/plugins/plugins-context/plugins-context-persistence/pom.xml
index b9d15bd5d..0ba9ed024 100644
--- a/plugins/plugins-context/plugins-context-persistence/pom.xml
+++ b/plugins/plugins-context/plugins-context-persistence/pom.xml
@@ -31,21 +31,4 @@
 
     <name>${project.artifactId}</name>
     <description>Plugins for 3pps that persist context</description>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/plugins-context-persistence/src/site/css/site.css b/plugins/plugins-context/plugins-context-persistence/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-persistence/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-persistence/src/site/images/logos.png b/plugins/plugins-context/plugins-context-persistence/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-persistence/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-persistence/src/site/site.xml b/plugins/plugins-context/plugins-context-persistence/src/site/site.xml
deleted file mode 100644
index e3ebfb610..000000000
--- a/plugins/plugins-context/plugins-context-persistence/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Persistence">
-    <body>
-        <menu name="APEX Plugins Context Persistence">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Persistence" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
index c5cfae846..c1224b8b8 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
@@ -49,21 +49,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-context/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/asciidoc/engine-config.adoc b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 8cc41c92d..000000000
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/asciidoc/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-context-schema-avro-dir}/site-docs/adoc/fragments/ctx-schema-avro-config.adoc[]
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/css/site.css b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/images/logos.png b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/site.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/site.xml
deleted file mode 100644
index 05c14a926..000000000
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Schema Avro">
-    <body>
-        <menu name="APEX Plugins Context Schema Avro">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Avro" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/plugins-context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml
index 50bc82828..243320b98 100644
--- a/plugins/plugins-context/plugins-context-schema/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/pom.xml
@@ -34,21 +34,4 @@
     <modules>
         <module>plugins-context-schema-avro</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/plugins-context-schema/src/site/css/site.css b/plugins/plugins-context/plugins-context-schema/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/plugins-context-schema/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/plugins-context-schema/src/site/images/logos.png b/plugins/plugins-context/plugins-context-schema/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/plugins-context-schema/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/plugins-context-schema/src/site/site.xml b/plugins/plugins-context/plugins-context-schema/src/site/site.xml
deleted file mode 100644
index 81477c74d..000000000
--- a/plugins/plugins-context/plugins-context-schema/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context Schema">
-    <body>
-        <menu name="APEX Plugins Context Schema">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Schema" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml
index 9079c969f..168010960 100644
--- a/plugins/plugins-context/pom.xml
+++ b/plugins/plugins-context/pom.xml
@@ -46,21 +46,4 @@
         <module>plugins-context-locking</module>
         <module>plugins-context-persistence</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-context/src/site/asciidoc/context.adoc b/plugins/plugins-context/src/site/asciidoc/context.adoc
deleted file mode 100644
index efcee80ce..000000000
--- a/plugins/plugins-context/src/site/asciidoc/context.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-context-dir}/site-docs/adoc/fragments/context.adoc[]
diff --git a/plugins/plugins-context/src/site/css/site.css b/plugins/plugins-context/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-context/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-context/src/site/images/logos.png b/plugins/plugins-context/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-context/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-context/src/site/site.xml b/plugins/plugins-context/src/site/site.xml
deleted file mode 100644
index 9055492a9..000000000
--- a/plugins/plugins-context/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Context">
-    <body>
-        <menu name="APEX Plugins Context">
-            <item href="context.html" name="Context Handlers" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Context" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
index 1cad1d699..d23083f95 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
@@ -54,23 +54,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-grpc-dir>${project.basedir}/src</adsite-plugins-event-carrier-grpc-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
index a3e8c910a..38b2ae36f 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
@@ -51,24 +51,4 @@
             <artifactId>netty-all</artifactId>
         </dependency>
     </dependencies>
-    
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-jms-dir>${project.basedir}/src</adsite-plugins-event-carrier-jms-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 5fd0fafce..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/asciidoc/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-jms-dir}/site-docs/adoc/fragments/ct-jms-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/site.xml
deleted file mode 100644
index 173ad4658..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier JMS">
-    <body>
-        <menu name="APEX Plugins Event Carrier JMS">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="JMS" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index 1b228a421..f35eb6a4d 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -43,24 +43,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-kafka-dir>${project.basedir}/src</adsite-plugins-event-carrier-kafka-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 44f96527c..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/asciidoc/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-kafka-dir}/site-docs/adoc/fragments/ct-kafka-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/site.xml
deleted file mode 100644
index d4a353290..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier Kafka">
-    <body>
-        <menu name="APEX Plugins Event Carrier Kafka">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Kafka" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
index d2b4625cf..419d4b30e 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
@@ -57,24 +57,4 @@
         </dependency>
 
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-restclient-dir>${project.basedir}/src</adsite-plugins-event-carrier-restclient-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 4c6d2c8a2..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/asciidoc/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-restclient-dir}/site-docs/adoc/fragments/ct-restclient-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/site.xml
deleted file mode 100644
index a64169234..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier REST-Client">
-    <body>
-        <menu name="APEX Plugins Event Carrier REST-Client">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="REST-Client" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
index 0aceada2b..df9f9d93d 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
@@ -61,24 +61,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-restrequestor-dir>${project.basedir}/src</adsite-plugins-event-carrier-restrequestor-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 91c4b0dc8..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/asciidoc/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-restrequestor-dir}/site-docs/adoc/fragments/ct-restrequestor-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/site.xml
deleted file mode 100644
index 1fc8e0eca..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier REST-Requestor">
-    <body>
-        <menu name="APEX Plugins Event Carrier REST-Requestor">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="REST-Requestor" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
index 387a37400..6ec7865ce 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
@@ -45,24 +45,4 @@
             <artifactId>policy-endpoints</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-restserver-dir>${project.basedir}/src</adsite-plugins-event-carrier-restserver-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 043ed04d1..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/asciidoc/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-restserver-dir}/site-docs/adoc/fragments/ct-restserver-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/site.xml
deleted file mode 100644
index 84c094eec..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier REST-Server">
-    <body>
-        <menu name="APEX Plugins Event Carrier REST-Server">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="REST-Server" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
index 85240a745..bc64e654a 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/pom.xml
@@ -36,24 +36,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-websocket-dir>${project.basedir}/src</adsite-plugins-event-carrier-websocket-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/engine-config-bcp.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/engine-config-bcp.adoc
deleted file mode 100644
index bfa111b35..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/engine-config-bcp.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/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index e81596f2c..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/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/ct-websocket-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/websockets.adoc b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/websockets.adoc
deleted file mode 100644
index 823e26a21..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/asciidoc/websockets.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)
-//
-
-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[]
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/site.xml
deleted file mode 100644
index f9410f5ef..000000000
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src/site/site.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
-  =========LICENSE_END=========================================================
--->
-
-<project name="APEX Plugins Event Carrier Websocket">
-    <body>
-        <menu name="APEX Plugins Event Carrier Websocket">
-            <item href="websockets.html" name="Introduction to Websockets" />
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="engine-config-bcp.html" name="BCP Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Websocket" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/pom.xml b/plugins/plugins-event/plugins-event-carrier/pom.xml
index 91d7222c0..f6c470def 100644
--- a/plugins/plugins-event/plugins-event-carrier/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/pom.xml
@@ -43,24 +43,4 @@
         <module>plugins-event-carrier-restrequestor</module>
         <module>plugins-event-carrier-grpc</module>
   </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-carrier-dir>${project.basedir}/src</adsite-plugins-event-carrier-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-carrier/src/site/asciidoc/carriertech.adoc b/plugins/plugins-event/plugins-event-carrier/src/site/asciidoc/carriertech.adoc
deleted file mode 100644
index 3b86a50ef..000000000
--- a/plugins/plugins-event/plugins-event-carrier/src/site/asciidoc/carriertech.adoc
+++ /dev/null
@@ -1,20 +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[]
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-file-io.adoc[]
-
-include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-eventrequestor-io.adoc[]
diff --git a/plugins/plugins-event/plugins-event-carrier/src/site/css/site.css b/plugins/plugins-event/plugins-event-carrier/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-carrier/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-carrier/src/site/images/logos.png b/plugins/plugins-event/plugins-event-carrier/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-carrier/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-carrier/src/site/site.xml b/plugins/plugins-event/plugins-event-carrier/src/site/site.xml
deleted file mode 100644
index a6c7fc98c..000000000
--- a/plugins/plugins-event/plugins-event-carrier/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Carrier">
-    <body>
-        <menu name="APEX Plugins Event Carrier">
-            <item href="carriertech.html" name="Carrier Technologies" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Carrier" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
index 3402f38b3..7d757dcbb 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
@@ -28,24 +28,4 @@
     <artifactId>plugins-event-protocol-jms</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugins for handling events that are being transported as JMS messages</description>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-protocol-jms-dir>${project.basedir}/src</adsite-plugins-event-protocol-jms-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 070781f66..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/asciidoc/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-protocol-jms-dir}/site-docs/adoc/fragments/ep-jms.adoc[]
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/css/site.css b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/images/logos.png b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/site.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/site.xml
deleted file mode 100644
index 9673c5e22..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Protocol JMS">
-    <body>
-        <menu name="APEX Plugins Event Protocol JMS">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="JMS" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
index 49c40a64d..ab3e463a1 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
@@ -107,24 +107,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-protocol-xml-dir>${project.basedir}/src</adsite-plugins-event-protocol-xml-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index f1de2cbd1..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/asciidoc/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-protocol-xml-dir}/site-docs/adoc/fragments/ep-xml.adoc[]
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/css/site.css b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/images/logos.png b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/site.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/site.xml
deleted file mode 100644
index e68f6ed67..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Protocol XML">
-    <body>
-        <menu name="APEX Plugins Event Protocol XML">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="XML" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
index 739582e94..2efb540d7 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
@@ -39,24 +39,4 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-protocol-yaml-dir>${project.basedir}/src</adsite-plugins-event-protocol-yaml-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-event/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/asciidoc/engine-config.adoc b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index e7103fd6f..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/asciidoc/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-protocol-yaml-dir}/site-docs/adoc/fragments/ep-yaml.adoc[]
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/css/site.css b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/images/logos.png b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/site.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/site.xml
deleted file mode 100644
index cae64b955..000000000
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Protocol YAML">
-    <body>
-        <menu name="APEX Plugins Event Protocol YAML">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="YAML" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/plugins-event-protocol/pom.xml b/plugins/plugins-event/plugins-event-protocol/pom.xml
index 154773e6e..cb56190b4 100644
--- a/plugins/plugins-event/plugins-event-protocol/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/pom.xml
@@ -41,24 +41,4 @@
         <module>plugins-event-protocol-xml</module>
         <module>plugins-event-protocol-yaml</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-event-protocol-dir>${project.basedir}/src</adsite-plugins-event-protocol-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-event/plugins-event-protocol/src/site/asciidoc/event-protocols.adoc b/plugins/plugins-event/plugins-event-protocol/src/site/asciidoc/event-protocols.adoc
deleted file mode 100644
index 4059dd199..000000000
--- a/plugins/plugins-event/plugins-event-protocol/src/site/asciidoc/event-protocols.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)
-//
-
-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[]
-
-include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/ep-apex.adoc[]
diff --git a/plugins/plugins-event/plugins-event-protocol/src/site/css/site.css b/plugins/plugins-event/plugins-event-protocol/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/plugins-event-protocol/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/plugins-event-protocol/src/site/images/logos.png b/plugins/plugins-event/plugins-event-protocol/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/plugins-event-protocol/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/plugins-event-protocol/src/site/site.xml b/plugins/plugins-event/plugins-event-protocol/src/site/site.xml
deleted file mode 100644
index 82afb502f..000000000
--- a/plugins/plugins-event/plugins-event-protocol/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event Protocol">
-    <body>
-        <menu name="APEX Plugins Event Protocol">
-            <item href="event-protocols.html" name="Event Protocols" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Protocol" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-event/pom.xml b/plugins/plugins-event/pom.xml
index 686c07c03..052a760f0 100644
--- a/plugins/plugins-event/pom.xml
+++ b/plugins/plugins-event/pom.xml
@@ -44,21 +44,4 @@
         <module>plugins-event-carrier</module>
         <module>plugins-event-protocol</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-event/src/site/css/site.css b/plugins/plugins-event/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-event/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-event/src/site/images/logos.png b/plugins/plugins-event/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-event/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-event/src/site/site.xml b/plugins/plugins-event/src/site/site.xml
deleted file mode 100644
index 21b0c2b11..000000000
--- a/plugins/plugins-event/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Event">
-    <body>
-        <menu name="APEX Plugins Event">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Event" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-java/pom.xml b/plugins/plugins-executor/plugins-executor-java/pom.xml
index ef56204ad..e8942c707 100644
--- a/plugins/plugins-executor/plugins-executor-java/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-java/pom.xml
@@ -28,24 +28,4 @@
     <artifactId>plugins-executor-java</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for execution of Java logic in Apex</description>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-java-dir>${project.basedir}/src</adsite-plugins-executor-java-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-java/src/site/asciidoc/engine-config.adoc b/plugins/plugins-executor/plugins-executor-java/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 433de8e6b..000000000
--- a/plugins/plugins-executor/plugins-executor-java/src/site/asciidoc/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-executor-java-dir}/site-docs/adoc/fragments/java-config.adoc[]
diff --git a/plugins/plugins-executor/plugins-executor-java/src/site/css/site.css b/plugins/plugins-executor/plugins-executor-java/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/plugins-executor-java/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/plugins-executor-java/src/site/images/logos.png b/plugins/plugins-executor/plugins-executor-java/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/plugins-executor-java/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/plugins-executor-java/src/site/site.xml b/plugins/plugins-executor/plugins-executor-java/src/site/site.xml
deleted file mode 100644
index d14cd5d04..000000000
--- a/plugins/plugins-executor/plugins-executor-java/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor Java">
-    <body>
-        <menu name="APEX Plugins Executor Java">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Java" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
index e55838c4c..016e564d9 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
@@ -60,24 +60,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-javascript-dir>${project.basedir}/src</adsite-plugins-executor-javascript-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/site/asciidoc/engine-config.adoc b/plugins/plugins-executor/plugins-executor-javascript/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 1fe6c5650..000000000
--- a/plugins/plugins-executor/plugins-executor-javascript/src/site/asciidoc/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-executor-javascript-dir}/site-docs/adoc/fragments/javascript-config.adoc[]
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/site/css/site.css b/plugins/plugins-executor/plugins-executor-javascript/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/plugins-executor-javascript/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/site/images/logos.png b/plugins/plugins-executor/plugins-executor-javascript/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/plugins-executor-javascript/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/plugins-executor-javascript/src/site/site.xml b/plugins/plugins-executor/plugins-executor-javascript/src/site/site.xml
deleted file mode 100644
index 7af733179..000000000
--- a/plugins/plugins-executor/plugins-executor-javascript/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor Javascript">
-    <body>
-        <menu name="APEX Plugins Executor Javascript">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Javascript" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index b70c3c141..c7af58546 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -61,24 +61,4 @@
             <version>1.2.23</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-jruby-dir>${project.basedir}/src</adsite-plugins-executor-jruby-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/site/asciidoc/engine-config.adoc b/plugins/plugins-executor/plugins-executor-jruby/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 90b3dacf0..000000000
--- a/plugins/plugins-executor/plugins-executor-jruby/src/site/asciidoc/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-executor-jruby-dir}/site-docs/adoc/fragments/jruby-config.adoc[]
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/site/css/site.css b/plugins/plugins-executor/plugins-executor-jruby/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/plugins-executor-jruby/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/site/images/logos.png b/plugins/plugins-executor/plugins-executor-jruby/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/plugins-executor-jruby/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/plugins-executor-jruby/src/site/site.xml b/plugins/plugins-executor/plugins-executor-jruby/src/site/site.xml
deleted file mode 100644
index d9dd50211..000000000
--- a/plugins/plugins-executor/plugins-executor-jruby/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor Jruby">
-    <body>
-        <menu name="APEX Plugins Executor Jruby">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Jruby" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-jython/pom.xml b/plugins/plugins-executor/plugins-executor-jython/pom.xml
index 2613e65ad..0def156c1 100644
--- a/plugins/plugins-executor/plugins-executor-jython/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jython/pom.xml
@@ -37,24 +37,4 @@
             <version>2.7.1</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-jython-dir>${project.basedir}/src</adsite-plugins-executor-jython-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-executor/plugins-executor-jython/src/site/asciidoc/engine-config.adoc b/plugins/plugins-executor/plugins-executor-jython/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index e92edd0b9..000000000
--- a/plugins/plugins-executor/plugins-executor-jython/src/site/asciidoc/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-executor-jython-dir}/site-docs/adoc/fragments/jython-config.adoc[]
diff --git a/plugins/plugins-executor/plugins-executor-jython/src/site/css/site.css b/plugins/plugins-executor/plugins-executor-jython/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/plugins-executor-jython/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/plugins-executor-jython/src/site/images/logos.png b/plugins/plugins-executor/plugins-executor-jython/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/plugins-executor-jython/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/plugins-executor-jython/src/site/site.xml b/plugins/plugins-executor/plugins-executor-jython/src/site/site.xml
deleted file mode 100644
index e35c23398..000000000
--- a/plugins/plugins-executor/plugins-executor-jython/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor Jython">
-    <body>
-        <menu name="APEX Plugins Executor Jython">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Jython" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-mvel/pom.xml b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
index 083baf586..084b6a9f5 100644
--- a/plugins/plugins-executor/plugins-executor-mvel/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
@@ -36,24 +36,4 @@
             <version>2.4.8.Final</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-mvel-dir>${project.basedir}/src</adsite-plugins-executor-mvel-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/site/asciidoc/engine-config.adoc b/plugins/plugins-executor/plugins-executor-mvel/src/site/asciidoc/engine-config.adoc
deleted file mode 100644
index 5cffad93b..000000000
--- a/plugins/plugins-executor/plugins-executor-mvel/src/site/asciidoc/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-executor-mvel-dir}/site-docs/adoc/fragments/mvel-config.adoc[]
diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/site/css/site.css b/plugins/plugins-executor/plugins-executor-mvel/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/plugins-executor-mvel/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/site/images/logos.png b/plugins/plugins-executor/plugins-executor-mvel/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/plugins-executor-mvel/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/plugins-executor-mvel/src/site/site.xml b/plugins/plugins-executor/plugins-executor-mvel/src/site/site.xml
deleted file mode 100644
index 4e83458b1..000000000
--- a/plugins/plugins-executor/plugins-executor-mvel/src/site/site.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor MVEL">
-    <body>
-        <menu name="APEX Plugins Executor MVEL">
-            <item href="engine-config.html" name="Engine Configuration" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="MVEL" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml
index cb7fed587..d56d1a511 100644
--- a/plugins/plugins-executor/pom.xml
+++ b/plugins/plugins-executor/pom.xml
@@ -47,24 +47,4 @@
         <!--module>plugins-executor-jython</module-->
         <module>plugins-executor-mvel</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-plugins-executor-dir>${project.basedir}/src</adsite-plugins-executor-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-executor/src/site/asciidoc/executors.adoc b/plugins/plugins-executor/src/site/asciidoc/executors.adoc
deleted file mode 100644
index 7434f3625..000000000
--- a/plugins/plugins-executor/src/site/asciidoc/executors.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-executor-dir}/site-docs/adoc/fragments/executors.adoc[]
diff --git a/plugins/plugins-executor/src/site/css/site.css b/plugins/plugins-executor/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-executor/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-executor/src/site/images/logos.png b/plugins/plugins-executor/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-executor/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-executor/src/site/site.xml b/plugins/plugins-executor/src/site/site.xml
deleted file mode 100644
index 80c06238f..000000000
--- a/plugins/plugins-executor/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Executor">
-    <body>
-        <menu name="APEX Plugins Executor">
-            <item href="executors.html" name="Executors" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Executor" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
index 880db11a0..d88ed7695 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/pom.xml
@@ -27,21 +27,4 @@
     <artifactId>plugins-persistence-jpa-eclipselink</artifactId>
     <name>${project.artifactId}</name>
     <description>[${project.parent.artifactId}] Plugin for persistence using EclipseLink</description>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/plugins-persistence/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/css/site.css b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/images/logos.png b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/site.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/site.xml
deleted file mode 100644
index 99772b66a..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-eclipselink/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Persistence JPA Eclipselink">
-    <body>
-        <menu name="APEX Plugins Persistence JPA Eclipselink">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Eclipselink" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
index b39d79b7f..15a3a4c00 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/pom.xml
@@ -48,21 +48,4 @@
     <modules>
         <module>plugins-persistence-jpa-eclipselink</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/plugins/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/css/site.css b/plugins/plugins-persistence/plugins-persistence-jpa/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/images/logos.png b/plugins/plugins-persistence/plugins-persistence-jpa/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/site.xml b/plugins/plugins-persistence/plugins-persistence-jpa/src/site/site.xml
deleted file mode 100644
index 1dc87ed17..000000000
--- a/plugins/plugins-persistence/plugins-persistence-jpa/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Persistence JPA">
-    <body>
-        <menu name="APEX Plugins Persistence JPA">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="JPA" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/pom.xml b/plugins/plugins-persistence/pom.xml
index 2c7bc6fd8..4015aa9e0 100644
--- a/plugins/plugins-persistence/pom.xml
+++ b/plugins/plugins-persistence/pom.xml
@@ -43,21 +43,4 @@
     <modules>
         <module>plugins-persistence-jpa</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/plugins/plugins-persistence/src/site/css/site.css b/plugins/plugins-persistence/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/plugins-persistence/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/plugins-persistence/src/site/images/logos.png b/plugins/plugins-persistence/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/plugins-persistence/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/plugins-persistence/src/site/site.xml b/plugins/plugins-persistence/src/site/site.xml
deleted file mode 100644
index 311b876ef..000000000
--- a/plugins/plugins-persistence/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins Persistence">
-    <body>
-        <menu name="APEX Plugins Persistence">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Persistence" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9f301465f..7d614d124 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -43,21 +43,4 @@
         <module>plugins-executor</module>
         <module>plugins-persistence</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/plugins/src/site/css/site.css b/plugins/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/plugins/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/plugins/src/site/images/logos.png b/plugins/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/plugins/src/site/images/logos.png
+++ /dev/null
diff --git a/plugins/src/site/site.xml b/plugins/src/site/site.xml
deleted file mode 100644
index 9dc5421f3..000000000
--- a/plugins/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Plugins">
-    <body>
-        <menu name="APEX Plugins">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Plugins" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 86eb57b8f..92136778c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-ext</artifactId>
-            <version>1.7.30</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -215,506 +214,6 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <!--This profile is used to create local APEX documentation and a Maven site -->
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <!-- needed to add this to avoid slow site creation due to many dead repos in some configuration see: https://stackoverflow.com/questions/26144541/why-am-i-getting-maven-error-unable-to-determine-if-resource-x-exists-in-http 
-                     see: https://stackoverflow.com/questions/26144541/why-am-i-getting-maven-error-unable-to-determine-if-resource-x-exists-in-http/35673586 see: https://whatiscomingtomyhead.wordpress.com/2011/04/20/if-your-maven-site-build-is-too-slow/ -->
-                <dependency.locations.enabled>false</dependency.locations.enabled>
-
-                <!-- Site and ADOC properties -->
-                <apex.adsite.prefix>https://www.onap.org/policy/apex-pdp/site</apex.adsite.prefix>
-                <release-version>${project.version}</release-version>
-
-                <adsite-main-dir>${project.basedir}/src</adsite-main-dir>
-                <adsite-tools-wsclients-dir>${project.basedir}/tools/simple-wsclient/src</adsite-tools-wsclients-dir>
-                <adsite-tools-common-dir>${project.basedir}/tools/tools-common/src</adsite-tools-common-dir>
-
-                <adsite-examples-myfirstpolicy-dir>${project.basedir}/examples/examples-myfirstpolicy/src</adsite-examples-myfirstpolicy-dir>
-                <adsite-examples-decisionmaker-dir>${project.basedir}/examples/examples-decisionmaker/src</adsite-examples-decisionmaker-dir>
-                <adsite-examples-pcvs-dir>${project.basedir}/examples/examples-pcvs/src</adsite-examples-pcvs-dir>
-                <adsite-examples-periodic-dir>${project.basedir}/examples/examples-periodic/src</adsite-examples-periodic-dir>
-                <adsite-examples-onap-vcpe-dir>${project.basedir}/examples/examples-onap-vcpe/src</adsite-examples-onap-vcpe-dir>
-                <adsite-examples-onap-bbs-dir>${project.basedir}/examples/examples-onap-bbs/src</adsite-examples-onap-bbs-dir>
-                <adsite-examples-servlet-dir>${project.basedir}/examples/examples-servlet/src</adsite-examples-servlet-dir>
-
-                <adsite-packages-docker-dir>${project.basedir}/packages/apex-pdp-docker/src</adsite-packages-docker-dir>
-
-                <adsite-plugins-event-protocol-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/src</adsite-plugins-event-protocol-dir>
-                <adsite-plugins-event-protocol-jms-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src</adsite-plugins-event-protocol-jms-dir>
-                <adsite-plugins-event-protocol-xml-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src</adsite-plugins-event-protocol-xml-dir>
-                <adsite-plugins-event-protocol-yaml-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src</adsite-plugins-event-protocol-yaml-dir>
-
-                <adsite-plugins-event-carrier-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/src</adsite-plugins-event-carrier-dir>
-                <adsite-plugins-event-carrier-jms-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src</adsite-plugins-event-carrier-jms-dir>
-                <adsite-plugins-event-carrier-restclient-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src</adsite-plugins-event-carrier-restclient-dir>
-                <adsite-plugins-event-carrier-restserver-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src</adsite-plugins-event-carrier-restserver-dir>
-                <adsite-plugins-event-carrier-restrequestor-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src</adsite-plugins-event-carrier-restrequestor-dir>
-                <adsite-plugins-event-carrier-kafka-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src</adsite-plugins-event-carrier-kafka-dir>
-                <adsite-plugins-event-carrier-websocket-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src</adsite-plugins-event-carrier-websocket-dir>
-                <adsite-plugins-context-dir>${project.basedir}/plugins/plugins-context/src</adsite-plugins-context-dir>
-                <adsite-plugins-context-schema-avro-dir>${project.basedir}/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src</adsite-plugins-context-schema-avro-dir>
-                <adsite-plugins-executor-dir>${project.basedir}/plugins/plugins-executor/src</adsite-plugins-executor-dir>
-                <adsite-plugins-executor-java-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-java/src</adsite-plugins-executor-java-dir>
-                <adsite-plugins-executor-javascript-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-javascript/src</adsite-plugins-executor-javascript-dir>
-                <adsite-plugins-executor-jruby-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-jruby/src</adsite-plugins-executor-jruby-dir>
-                <!-- Jython support disabled due to security concerns -->
-                <!-- adsite-plugins-executor-jython-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-jython/src</adsite-plugins-executor-jython-dir-->
-                <adsite-plugins-executor-mvel-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-mvel/src</adsite-plugins-executor-mvel-dir>
-
-                <adsite-services-engine-dir>${project.basedir}/services/services-engine/src</adsite-services-engine-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/</url>
-                </site>
-            </distributionManagement>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.commonjava.maven.plugins</groupId>
-                        <artifactId>directory-maven-plugin</artifactId>
-                        <version>0.2</version>
-                        <executions>
-                            <execution>
-                                <id>directories</id>
-                                <goals>
-                                    <goal>directory-of</goal>
-                                </goals>
-                                <phase>initialize</phase>
-                                <configuration>
-                                    <property>apex.basedir</property>
-                                    <project>
-                                        <groupId>org.onap.policy.apex-pdp</groupId>
-                                        <artifactId>apex-pdp</artifactId>
-                                    </project>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-site-plugin</artifactId>
-                        <version>3.7.1</version>
-                        <configuration>
-                            <stagingDirectory>${apex.basedir}/target/ad-site</stagingDirectory>
-                            <asciidoc>
-                                <embedAssets>true</embedAssets>
-                                <attributes>
-                                    <source-highlighter>coderay</source-highlighter>
-                                    <coderay-css>style</coderay-css>
-                                    <imagesdir>images</imagesdir>
-                                </attributes>
-                            </asciidoc>
-                            <moduleExcludes>
-                                <asciidoc>**/_*.adoc</asciidoc>
-                            </moduleExcludes>
-                        </configuration>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.maven.doxia</groupId>
-                                <artifactId>doxia-site-renderer</artifactId>
-                                <version>1.8</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.asciidoctor</groupId>
-                                <artifactId>asciidoctor-maven-plugin</artifactId>
-                                <version>1.5.6</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-site-css</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site/css</directory>
-                                            <includes>
-                                                <include>**/*.css</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/css</outputDirectory>
-                                    <overwrite>true</overwrite>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-site-logos</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site/images</directory>
-                                            <includes>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/images</outputDirectory>
-                                    <overwrite>true</overwrite>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-um-install-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources/images/install-guide</directory>
-                                            <includes>
-                                                <include>**/*.jpg</include>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/user-manual/install/images/install-guide</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-howto-config-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources/images/apex-intro</directory>
-                                            <includes>
-                                                <include>ApexEngineConfig.jpg</include>
-                                                <include>ApexEngineConfig.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/user-manual/configuration/images/apex-intro</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-tech-intro-apex-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources/images/apex-intro</directory>
-                                            <includes>
-                                                <include>**/*.jpg</include>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/apex-intro/images/apex-intro</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-tech-pm-apex-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources/images/apex-policy-model</directory>
-                                            <includes>
-                                                <include>**/*.jpg</include>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/policy-guide/policy-model/images/apex-policy-model</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-tech-pm-apex-intro-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources/images/apex-intro</directory>
-                                            <includes>
-                                                <include>ApexPolicyMatrix.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/policy-guide/images/apex-intro</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-domain-mfp-images</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/examples/examples-myfirstpolicy/src/site-docs/adoc/resources/images</directory>
-                                            <includes>
-                                                <include>**/*.jpg</include>
-                                                <include>**/*.png</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/user-manual/my-first-policy/images</outputDirectory>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>copy-asciidoc-generated</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>target/generated-docs</directory>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.build.directory}/site/docs-apex</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-project-info-reports-plugin</artifactId>
-                        <version>2.9</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.0.0-M1</version>
-                        <reportSets>
-                            <reportSet>
-                                <id>default</id>
-                                <reports>
-                                    <report>javadoc</report>
-                                </reports>
-                            </reportSet>
-                            <reportSet>
-                                <id>aggregate</id>
-                                <inherited>false</inherited>
-                                <reports>
-                                    <report>aggregate</report>
-                                </reports>
-                            </reportSet>
-                        </reportSets>
-                        <configuration>
-                            <destDir>javadocs</destDir>
-                            <source>${maven.compiler.target}</source>
-                            <encoding>${project.resources.sourceEncoding}</encoding>
-                            <docencoding>${project.resources.sourceEncoding}</docencoding>
-                            <charset>${project.resources.sourceEncoding}</charset>
-                            <!--<aggregate>false</aggregate>-->
-                            <nohelp>true</nohelp>
-                            <header>APEX - ${project.artifactId} ${project.version}</header>
-                            <footer>APEX - ${project.artifactId} ${project.version}</footer>
-                            <doctitle>APEX - ${project.artifactId} ${project.version}</doctitle>
-                            <noqualifier>all</noqualifier>
-                            <detectLinks>false</detectLinks>
-                            <detectJavaApiLink>true</detectJavaApiLink>
-                            <javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
-                            <docfilessubdirs>true</docfilessubdirs>
-                            <overview>overview.html</overview>
-                            <show>public</show>
-                            <!-- Exclude JAXB generated packages -->
-                            <excludePackageNames>org.onap.policy.apex.plugins.event.protocol.xml.jaxb</excludePackageNames>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-
-        <profile>
-            <id>apexDocs</id>
-            <activation>
-                <property>
-                    <name>apexDocs</name>
-                </property>
-            </activation>
-            <modules />
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>1.5.6</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.asciidoctor</groupId>
-                                <artifactId>asciidoctorj-pdf</artifactId>
-                                <version>1.5.0-alpha.16</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <sourceHighlighter>coderay</sourceHighlighter>
-                            <sourceDirectory>src/site-docs/adoc/guides</sourceDirectory>
-                            <preserveDirectories>true</preserveDirectories>
-                            <attributes>
-                                <toc />
-                                <pagenums />
-                                <sectnums />
-                                <linkcss>true</linkcss>
-                                <stylesdir>styles</stylesdir>
-
-                                <!-- Change this to get another style -->
-                                <stylesheet>compass/rocket-panda.css</stylesheet>
-                                <pdf-stylesdir>${project.basedir}/src/site-docs/adoc/resources-pdf/themes</pdf-stylesdir>
-                                <pdf-style>apex-pdf.yml</pdf-style>
-                                <pdf-fontsdir>${project.basedir}/src/site-docs/adoc/resources-pdf/fonts</pdf-fontsdir>
-
-                                <revnumber>${project.version}</revnumber>
-                                <revdate>${maven.build.timestamp}</revdate>
-                                <organization>${project.organization.name}</organization>
-
-                                <release-version>${project.version}</release-version>
-
-                                <adsite-main-dir>${project.basedir}/src</adsite-main-dir>
-                                <adsite-tools-wsclients-dir>${project.basedir}/tools/simple-wsclient/src</adsite-tools-wsclients-dir>
-                                <adsite-tools-common-dir>${project.basedir}/tools/tools-common/src</adsite-tools-common-dir>
-
-                                <adsite-examples-myfirstpolicy-dir>${project.basedir}/examples/examples-myfirstpolicy/src</adsite-examples-myfirstpolicy-dir>
-                                <adsite-examples-decisionmaker-dir>${project.basedir}/examples/examples-decisionmaker/src</adsite-examples-decisionmaker-dir>
-                                <adsite-examples-pcvs-dir>${project.basedir}/examples/examples-pcvs/src</adsite-examples-pcvs-dir>
-                                <adsite-examples-periodic-dir>${project.basedir}/examples/examples-periodic/src</adsite-examples-periodic-dir>
-                                <adsite-examples-onap-vcpe-dir>${project.basedir}/examples/examples-onap-vcpe/src</adsite-examples-onap-vcpe-dir>
-                                <adsite-examples-onap-bbs-dir>${project.basedir}/examples/examples-onap-bbs/src</adsite-examples-onap-bbs-dir>
-                                <adsite-examples-servlet-dir>${project.basedir}/examples/examples-servlet/src</adsite-examples-servlet-dir>
-
-                                <adsite-packages-docker-dir>${project.basedir}/packages/apex-pdp-docker/src</adsite-packages-docker-dir>
-
-                                <adsite-plugins-event-protocol-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/src</adsite-plugins-event-protocol-dir>
-                                <adsite-plugins-event-protocol-jms-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/src</adsite-plugins-event-protocol-jms-dir>
-                                <adsite-plugins-event-protocol-xml-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/src</adsite-plugins-event-protocol-xml-dir>
-                                <adsite-plugins-event-protocol-yaml-dir>${project.basedir}/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/src</adsite-plugins-event-protocol-yaml-dir>
-                                <adsite-plugins-event-carrier-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/src</adsite-plugins-event-carrier-dir>
-                                <adsite-plugins-event-carrier-jms-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/src</adsite-plugins-event-carrier-jms-dir>
-                                <adsite-plugins-event-carrier-restclient-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/src</adsite-plugins-event-carrier-restclient-dir>
-                                <adsite-plugins-event-carrier-restserver-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/src</adsite-plugins-event-carrier-restserver-dir>
-                                <adsite-plugins-event-carrier-restrequestor-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src</adsite-plugins-event-carrier-restrequestor-dir>
-                                <adsite-plugins-event-carrier-kafka-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/src</adsite-plugins-event-carrier-kafka-dir>
-                                <adsite-plugins-event-carrier-websocket-dir>${project.basedir}/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-websocket/src</adsite-plugins-event-carrier-websocket-dir>
-                                <adsite-plugins-context-dir>${project.basedir}/plugins/plugins-context/src</adsite-plugins-context-dir>
-                                <adsite-plugins-context-schema-avro-dir>${project.basedir}/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/src</adsite-plugins-context-schema-avro-dir>
-                                <adsite-plugins-executor-dir>${project.basedir}/plugins/plugins-executor/src</adsite-plugins-executor-dir>
-                                <adsite-plugins-executor-java-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-java/src</adsite-plugins-executor-java-dir>
-                                <adsite-plugins-executor-javascript-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-javascript/src</adsite-plugins-executor-javascript-dir>
-                                <adsite-plugins-executor-jruby-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-jruby/src</adsite-plugins-executor-jruby-dir>
-                                <adsite-plugins-executor-jython-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-jython/src</adsite-plugins-executor-jython-dir>
-                                <adsite-plugins-executor-mvel-dir>${project.basedir}/plugins/plugins-executor/plugins-executor-mvel/src</adsite-plugins-executor-mvel-dir>
-
-                                <adsite-services-engine-dir>${project.basedir}/services/services-engine/src</adsite-services-engine-dir>
-                            </attributes>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>asciidoc-html-doc</id>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <backend>html</backend>
-                                    <outputDirectory>${project.build.directory}/generated-docs/html</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>src/site-docs/adoc/resources</directory>
-                                        </resource>
-                                        <resource>
-                                            <directory>${project.basedir}/examples/examples-myfirstpolicy/src/site-docs/adoc/resources</directory>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                                <goals>
-                                    <goal>process-asciidoc</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>asciidoc-pdf-doc</id>
-                                <phase>generate-resources</phase>
-                                <configuration>
-                                    <backend>pdf</backend>
-                                    <outputDirectory>${project.build.directory}/generated-docs/pdf</outputDirectory>
-                                    <imagesDir>${project.basedir}/target/generated-docs/html/images</imagesDir>
-                                </configuration>
-                                <goals>
-                                    <goal>process-asciidoc</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>3.0.2</version>
-                        <executions>
-                            <execution>
-                                <id>copy-site-css</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.basedir}/src/site-docs/adoc/guides</directory>
-                                            <includes>
-                                                <include>**/*.css</include>
-                                            </includes>
-                                        </resource>
-                                    </resources>
-                                    <outputDirectory>${project.basedir}/target/generated-docs/pdf/styles</outputDirectory>
-                                    <overwrite>true</overwrite>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 
     <modules>
diff --git a/services/pom.xml b/services/pom.xml
index ccc482bc0..7c61b131d 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -37,21 +37,4 @@
         <module>services-engine</module>
         <module>services-onappf</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml
index f34142782..ebe3eb949 100644
--- a/services/services-engine/pom.xml
+++ b/services/services-engine/pom.xml
@@ -100,21 +100,4 @@
             </resource>
         </resources>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/services/services-engine/src/site/asciidoc/config-example.adoc b/services/services-engine/src/site/asciidoc/config-example.adoc
deleted file mode 100644
index d429d2fb6..000000000
--- a/services/services-engine/src/site/asciidoc/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/services/services-engine/src/site/asciidoc/config-general-format.adoc b/services/services-engine/src/site/asciidoc/config-general-format.adoc
deleted file mode 100644
index d7b0f50f0..000000000
--- a/services/services-engine/src/site/asciidoc/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[]
\ No newline at end of file
diff --git a/services/services-engine/src/site/asciidoc/config-interfaces-general.adoc b/services/services-engine/src/site/asciidoc/config-interfaces-general.adoc
deleted file mode 100644
index d82894de7..000000000
--- a/services/services-engine/src/site/asciidoc/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/services/services-engine/src/site/asciidoc/config-service-parameters.adoc b/services/services-engine/src/site/asciidoc/config-service-parameters.adoc
deleted file mode 100644
index b12c84a7d..000000000
--- a/services/services-engine/src/site/asciidoc/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/services/services-engine/src/site/css/site.css b/services/services-engine/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/services/services-engine/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/services/services-engine/src/site/images/logos.png b/services/services-engine/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/services/services-engine/src/site/images/logos.png
+++ /dev/null
diff --git a/services/services-engine/src/site/site.xml b/services/services-engine/src/site/site.xml
deleted file mode 100644
index c9a70a66e..000000000
--- a/services/services-engine/src/site/site.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Services Engine">
-    <body>
-        <menu name="APEX Services Engine">
-            <item href="config-general-format.html" name="General Configuration Format" />
-            <item href="config-service-parameters.html" name="Engine Service Parameters" />
-            <item href="config-interfaces-general.html" name="Input and Output Interfaces" />
-            <item href="config-example.html" name="Configuration Example" />
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Engine" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/services/src/site/css/site.css b/services/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/services/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/services/src/site/images/logos.png b/services/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/services/src/site/images/logos.png
+++ /dev/null
diff --git a/services/src/site/site.xml b/services/src/site/site.xml
deleted file mode 100644
index 5572584ed..000000000
--- a/services/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX Services">
-    <body>
-        <menu name="APEX Services">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Services" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
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[]
-
diff --git a/src/site/css/site.css b/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/src/site/images/logos.png b/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/src/site/images/logos.png
+++ /dev/null
diff --git a/src/site/site.xml b/src/site/site.xml
deleted file mode 100644
index 11ae2c15a..000000000
--- a/src/site/site.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<project name="APEX">
-    <body>
-        <menu name="APEX - Adaptive Policy Execution">
-            <item href="index.html" name="Welcome" />
-
-            <item href="apex-intro/intro-introduction.html" name="Short APEX Introduction" collapse="true">
-                <item href="apex-intro/intro-configuration-matrix.html" name="Configurations" />
-                <item href="apex-intro/intro-policy-matrix.html" name="Policy Matrix" />
-                <item href="apex-intro/intro-upee-deployment.html" name="Flexible Deployment" />
-                <item href="apex-intro/intro-upee-clustering.html" name="Flexible Clustering" />
-                <item href="apex-intro/intro-resources.html" name="Resources" />
-            </item>
-
-            <item href="apex-publications.html" name="APEX Publications" collapse="false" />
-
-            <item href="user-manual.html" name="User Manual" collapse="true">
-                <item href="user-manual/install/um-install.html" name="Installation Guide" collapse="true">
-                    <item href="user-manual/install/um-install-get-source.html" name="Get Source" />
-                    <item href="user-manual/install/um-install-build-apex.html" name="Build APEX" />
-                    <item href="user-manual/install/um-install-install.html" name="Install APEX" />
-                    <item href="user-manual/install/um-install-layout.html" name="Final Layout" />
-                    <item href="user-manual/install/um-install-configure.html" name="System Configuration" />
-                    <item href="user-manual/install/um-install-verify.html" name="Verify Installation" />
-                    <item href="user-manual/install/um-install-wars.html" name="Install WARs" />
-                    <item href="user-manual/install/um-install-docker.html" name="APEX in Docker" />
-                </item>
-
-                <item href="user-manual/configuration/um-00-introduction.html" name="Configure APEX"
-                    collapse="true">
-                    <item href="user-manual/configuration/um-01-config-general-format.html"
-                        name="Configuration File Format" />
-                    <item href="user-manual/configuration/um-02-config-service-parameters.html"
-                        name="Engine Service Params" />
-                    <item href="user-manual/configuration/um-03-config-interfaces-general.html"
-                        name="IO Interfaces, general" />
-                    <item href="user-manual/configuration/um-04-executors.html" name="Executors" />
-                    <item href="user-manual/configuration/um-05-context.html" name="Context Handlers" />
-                    <item href="user-manual/configuration/um-06-carriertech.html" name="Carrier Technologies" />
-                    <item href="user-manual/configuration/um-07-eventprotols.html" name="Event Protocols" />
-                    <item href="user-manual/configuration/um-99-config-example.html" name="Example Configuration" />
-                </item>
-
-                <item href="user-manual/engine-apps/um-engapps.html" name="Running Engine and Apps" collapse="true">
-                    <item href="user-manual/engine-apps/um-engapps-engine.html" name="Running APEX Engine" />
-                    <item href="user-manual/engine-apps/um-engapps-cli-editor.html" name="Run CLI Editor" />
-                    <item href="user-manual/engine-apps/um-engapps-rest-editor.html" name="Run REST Editor" />
-                    <item href="user-manual/engine-apps/um-engapps-eng-monitoring.html" name="Run Engine Monitor" />
-                    <item href="user-manual/engine-apps/um-engapps-eng-deployment.html" name="Run Engine Deployer" />
-                    <item href="user-manual/engine-apps/um-engapps-full-client.html" name="Run Full Client" />
-                    <item href="user-manual/engine-apps/um-engapps-application-launcher.html"
-                        name="The Application Launcher" />
-                    <item href="user-manual/engine-apps/um-engapps-app-tpl-event-json.html"
-                        name="Create Event Templates" />
-                    <item href="user-manual/engine-apps/um-engapps-app-model-2-cli.html"
-                        name="Model to CLI Commands" />
-                    <item href="user-manual/engine-apps/um-engapps-app-ws.html" name="Websocket Applications" />
-                </item>
-
-                <item href="user-manual/my-first-policy/um-mfp-01-introduction.html" name="My First Policy"
-                    collapse="true">
-                    <item href="user-manual/my-first-policy/um-mfp-02-data-models.html" name="Data Models" />
-                    <item href="user-manual/my-first-policy/um-mfp-03-policy-step1.html" name="Policy Step 1">
-                        <item href="user-manual/my-first-policy/um-mfp-031-s1-new-model.html"
-                            name="New Policy Model" />
-                        <item href="user-manual/my-first-policy/um-mfp-032-s1-new-events.html" name="Events" />
-                        <item href="user-manual/my-first-policy/um-mfp-033-s1-new-policy.html" name="New Policy" />
-                        <item href="user-manual/my-first-policy/um-mfp-034-s1-test-policy.html"
-                            name="Test the Policy" />
-                        <item href="user-manual/my-first-policy/um-mfp-035-s1-clieditor.html"
-                            name="CLI Editor File" />
-                    </item>
-                    <item href="user-manual/my-first-policy/um-mfp-04-policy-step2.html" name="Policy Step 2">
-                        <item href="user-manual/my-first-policy/um-mfp-041-s2-extend-model.html"
-                            name="Extend Policy Model" />
-                        <item href="user-manual/my-first-policy/um-mfp-042-s2-test-policy.html"
-                            name="Test the Policy" />
-                        <item href="user-manual/my-first-policy/um-mfp-043-s2-clieditor.html"
-                            name="CLI Editor File" />
-                    </item>
-                </item>
-
-                <item href="user-manual/logging/um-logging.html" name="Logging Configuration" collapse="true">
-                    <item href="user-manual/logging/um-logging-standard-configuration.html"
-                        name="Standard Configuration" />
-                    <item href="user-manual/logging/um-logging-logback-status.html" name="Logback Status" />
-                    <item href="user-manual/logging/um-logging-logging-3pps.html" name="Logging 3PPs" />
-                    <item href="user-manual/logging/um-logging-logging-policy-logic.html"
-                        name="Logging Policy Logic" />
-                    <item href="user-manual/logging/um-logging-rolling-file-appenders.html"
-                        name="Rolling File Appenders" />
-                    <item href="user-manual/logging/um-logging-example-logic.html" name="Example: Logic" />
-                    <item href="user-manual/logging/um-logging-example-server.html" name="Example: Server" />
-                </item>
-
-                <item href="user-manual/websockets/um-websocket-introduction.html" name="APEX and Websockets"
-                    collapse="true">
-                    <item href="user-manual/websockets/um-websocket-engine-config.html"
-                        name="Configure APEX Engine" />
-                    <item href="user-manual/websockets/um-websocket-demo-00.html"
-                        name="Demo with VPN Policy Model ">
-                        <item href="user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.html"
-                            name="VPN Engine Configuration" />
-                        <item href="user-manual/websockets/um-websocket-demo-02-start-engine.html"
-                            name="Start APEX Engine" />
-                        <item href="user-manual/websockets/um-websocket-demo-03-start-echo-client.html"
-                            name="Run Echo Client" />
-                        <item href="user-manual/websockets/um-websocket-demo-04-start-console-client.html"
-                            name="Run Console Client" />
-                        <item href="user-manual/websockets/um-websocket-demo-05-send-events.html"
-                            name="Send Events" />
-                    </item>
-                </item>
-            </item>
-
-            <item href="policy-guide.html" name="Policy Guide" collapse="true">
-
-                <item href="policy-guide/pg-policy-matrix.html" name="Policy Matrix" />
-
-                <item href="policy-guide/policy-model/apm-introduction.html" name="APEX Policy Model"
-                    collapse="true">
-                    <item href="policy-guide/policy-model/apm-concepts-keys.html" name="Concepts and Keys" />
-                    <item href="policy-guide/policy-model/apm-concept-policymodel.html" name="Concept: PolicyModel" />
-                    <item href="policy-guide/policy-model/apm-concept-datatype.html" name="Concept: DataType" />
-                    <item href="policy-guide/policy-model/apm-concept-event.html" name="Concept: Event" />
-                    <item href="policy-guide/policy-model/apm-concept-eventfield.html" name="Concept: EventField" />
-                    <item href="policy-guide/policy-model/apm-concept-contextmap.html" name="Concept: ContextMap" />
-                    <item href="policy-guide/policy-model/apm-concept-contextitem.html" name="Concept: ContextItem" />
-                    <item href="policy-guide/policy-model/apm-concept-contextitemtemplate.html"
-                        name="Concept: ContextItemTemplate" />
-                    <item href="policy-guide/policy-model/apm-concept-task.html" name="Concept: Task" />
-                    <item href="policy-guide/policy-model/apm-concept-taskparameter.html"
-                        name="Concept: TaskParameter" />
-                    <item href="policy-guide/policy-model/apm-concept-logic.html" name="Concept: Logic" />
-                    <item href="policy-guide/policy-model/apm-concept-policy.html" name="Concept: Policy" />
-                    <item href="policy-guide/policy-model/apm-concept-state.html" name="Concept: State" />
-                </item>
-
-                <item href="policy-guide/pg-task-logic.html" name="Writing Task Logic" />
-                <item href="policy-guide/pg-task-selection-logic.html" name="Writing Task Selection Logic" />
-                <item href="policy-guide/pg-logic-cheatsheet.html" name="Logic Cheatsheet" />
-                <item href="policy-guide/pg-policy-examples.html" name="Policy Examples" />
-            </item>
-
-            <item href="developer-guide.html" name="Developer Guide" collapse="true">
-                <item href="developer-guide/build/dg-build.html" name="Build APEX" collapse="true">
-                    <item href="developer-guide/build/dg-build-standard.html" name="Standard Build" />
-                    <item href="developer-guide/build/dg-build-checkstyle.html" name="Checkstyle" />
-                    <item href="developer-guide/build/dg-build-with-tests.html" name="Build with Tests" />
-                    <item href="developer-guide/build/dg-build-with-all-tests.html" name="Build with all Tests" />
-                    <item href="developer-guide/build/dg-build-with-all-components.html"
-                        name="Build all Components" />
-                    <item href="developer-guide/build/dg-build-documentation.html" name="Build documentation" />
-                    <item href="developer-guide/build/dg-build-site.html" name="Build site" />
-                </item>
-
-                <item href="developer-guide/codestyle/dg-codestyle.html" name="Codestyle" collapse="true">
-                    <item href="developer-guide/codestyle/dg-codestyle-02-rules.html" name="Java Coding Rules" />
-                    <item href="developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.html"
-                        name="Plugin: JAutoDoc" />
-                    <item href="developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.html"
-                        name="Plugin: Checkstyle" />
-                    <item href="developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.html"
-                        name="Configure Eclipse Templates" />
-                    <item href="developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.html"
-                        name="Configure JAutoDoc Templates" />
-                    <item href="developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.html"
-                        name="Configure Checkstyle Maven" />
-                    <item href="developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.html"
-                        name="Run Checkstyle Maven" />
-                    <item href="developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.html"
-                        name="Configure Checkstyle Eclipse" />
-                    <item href="developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.html"
-                        name="Configure Checkstyle Blueprint" />
-                    <item href="developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.html"
-                        name="Eclipse Source Operations" />
-                    <item href="developer-guide/codestyle/dg-codestyle-41-using-jautodoc.html"
-                        name="Using JAutoDoc" />
-                    <item href="developer-guide/codestyle/dg-codestyle-42-using-checkstyle.html"
-                        name="Using Checkstyle" />
-                    <item href="developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.html"
-                        name="Disable in Eclipse" />
-                    <item href="developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.html"
-                        name="Supress Checkstyle" />
-                </item>
-
-                <item href="developer-guide/dg-code-examples.html" name="Code Examples" />
-                <item href="javadocs/index.html" name="Complete API Doc" />
-            </item>
-
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="APEX" href="index.html" />
-        </breadcrumbs>
-    </body>
-
-    <publishDate position="right" />
-    <version position="right" />
-    <poweredBy>
-        <logo name="ONAP" href="http://www.onap.org/" img="images/logos.png" />
-    </poweredBy>
-
-    <skin>
-        <groupId>org.apache.maven.skins</groupId>
-        <artifactId>maven-fluido-skin</artifactId>
-        <version>1.5</version>
-    </skin>
-</project>
\ No newline at end of file
diff --git a/src/site/xdoc/developer-guide.xml b/src/site/xdoc/developer-guide.xml
deleted file mode 100644
index 40e689739..000000000
--- a/src/site/xdoc/developer-guide.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<document>
-	<properties>
-		<title>The APEX Developer Guide</title>
-		<author email="sven.van.der.meer@ericsson.com">Sven van der Meer</author>
-		<author email="liam.fallon@ericsson.com">Liam Fallon</author>
-		<author email="john.keeney@ericsson.com">John Keeny</author>
-	</properties>
-	<body>
-
-		<section name="The APEX Developer Guide">
-
-			<p>
-				The APEX developer guide combines a set of guides and howto documents, all addressing aspects for APEX developers.
-				These documents look at APEX internals and how to extend build and extend the platform, and how to add applications.
-				The guide and howto documents are provided as integrated documentation in the APEX site.
-				Furthermore, we provide stand-alone documents in HTML and PDF.
-			</p>
-
-			<p>
-				Note: most of the documentation is written in AsciiDoc.
-				We are using the AsciiDoctor version.
-				Due to the different build tools used for the different documentation targets, the rendered documents differ in style.
-				The content however comes always from a single, normative source located in the APEX source repositories.
-			</p>
-
-			<h3>APEX User Manual documentation</h3>
-				<table>
-					<tr>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="20%">Name</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="50%">Description</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="30%">Links</th>
-					</tr>
-					<tr>
-						<td>Developer Guide</td>
-						<td>
-							The complete APEX Developer Guide, including all HowTos and other documentation.
-							The stand-alone versions aggregate all other documents listed in this table.
-						</td>
-						<td>
-							<ul>
-								<li><a href="docs-apex/html/APEX-Developer-Guide.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/APEX-Developer-Guide.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: Build APEX from source</td>
-						<td>
-							This HowTo details all variations to build APEX from the source code.
-							Some of the options are: standard build with and without tests, build with all test, build with all components.
-							The document also shows how to build the documentation and the APEX site.
-						</td>
-						<td>
-							<ul>
-								<li><a href="developer-guide/build/dg-build.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-Build-APEX.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-Build-APEX.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: Codestyle and Automated Style Checks</td>
-						<td>
-							This HowTo defines the Java coding rules when developing for the APEX system and any of its components.
-							It details how to install and configure required Eclipse plugins (JAutoDoc, Checkstyle) and how to run automated style checks.
-						</td>
-						<td>
-							<ul>
-								<li><a href="developer-guide/codestyle/dg-codestyle.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-Codestyle.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-Codestyle.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-				</table>
-		</section>
-	</body>
-</document>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
deleted file mode 100644
index a18539b3c..000000000
--- a/src/site/xdoc/index.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<document>
-
-    <properties>
-        <title>Welcome to APEX - The Adaptive Policy EXecution (Engine)</title>
-        <author email="sven.van.der.meer@ericsson.com">Sven van der Meer</author>
-        <author email="liam.fallon@ericsson.com">Liam Fallon</author>
-        <author email="john.keeney@ericsson.com">John Keeny</author>
-    </properties>
-
-    <body>
-        <section name="Welcome to APEX - The Adaptive Policy EXecution (Engine)">
-
-            <p>
-                The APEX (Adaptive Policy Execution) policy engine is a fully featured policy engine that executes anything from simple to adaptive policies.
-                An adaptive policy is one that can modify its behavior based on the current conditions of the network and systems.
-                Adaptive policies have the following characteristics:
-                <ul>
-                    <li>Are able to make decisions at runtime rather than simply selecting decisions described at policy definition time</li>
-                    <li>Can use additional context information that was not provided in the incoming event or request</li>
-                    <li>Can be adapted or self-adapt at runtime to modify decision making</li>
-                </ul>
-            </p>
-
-            <p>
-                The APEX policy engine accepts input events and requests from other components, routes the input to the appropriate policies, computes the policy results, and generates response events or actions to be processed by other components.
-                The policies may be affected by information injected into the policy context as changes in business or domain goals, by information derived from previous executions of the policies, and by context information retrieved from other components (analytics, inventory, topology, etc.).
-            </p>
-
-            <p>
-                APEX connects to a Trigger System to receive events that can trigger a policy and to an Actioning System to send the result of a policy.
-                The connection support various common technologies, such as messaging systems (Kafka, Websockets), file input/output, and standard input/output.
-                APEX supports context (as additional information) for all events as well as inside the engine to support policies.
-                Context information can be read from any outside source.
-            </p>
-
-            <p>
-                A policy is defined in a Universal Execution Policy Specification (UEPS), directly executable in an APEX engine.
-                Higher-level policy specifications (or existing policy languages) can be easily translated in UEPS.
-            </p>
-
-            <p>
-                An APEX system can use multiple policy engines with different policies deployed on each of them.
-                Context information is automatically shared between all engine instances.
-                A simple deployment component is provided.
-            </p>
-
-
-            <h3>APEX Documentation</h3>
-                <table>
-                    <tr>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Document</th>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Description</th>
-                    </tr>
-                    <tr>
-                        <td><a href="apex-intro/intro-introduction.html">APEX Introduction</a></td>
-                        <td>
-                            This is a short introduction to APEX to show its features and capabilities.
-
-                            <br /><br />
-                            Also available as
-                                <a href="docs-apex/html/APEX-Introduction.html">stand-alone HTML</a> and
-                                <a href="docs-apex/pdf/APEX-Introduction.pdf">stand-alone PDF</a>.
-                        </td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="apex-publications.html">Publications</a></td>
-                        <td>
-                            APEX is based on a theor called Unifying Policy Theory (UPT).
-                            Over the years, we have published a number of papers on APEX, context management, policy in general, and control loops.
-                            This is the list of all APEX and the most relevant other publications.
-                            We provide links to full text versions if possible.
-
-                            <br /><br />
-                            Also available as
-                                <a href="docs-apex/html/APEX-Publications.html">stand-alone HTML</a> and
-                                <a href="docs-apex/pdf/APEX-Publications.pdf">stand-alone PDF</a>.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><a href="user-manual.html">APEX User Manual</a></td>
-                        <td>
-                            The APEX user manual combines a set of guides and howto documents, all supporting the use of APEX.
-                            The guides and howto documents are provided as integrated documentation in the APEX site.
-                            Furthermore, we provide stand-alone documents in HTML and PDF.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><a href="policy-guide.html">APEX Policy Guide</a></td>
-                        <td>
-                            The APEX policy guide combines a set of howto documents, all supporting APEX and policy, including how to write task and task selection logic.
-                            The howto documents are provided as integrated documentation in the APEX site.
-                            Furthermore, we provide stand-alone documents in HTML and PDF.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><a href="developer-guide.html">APEX Development Guide</a></td>
-                        <td>
-                            The APEX developer guide combines a set of guides and howto documents, all addressing aspects for APEX developers.
-                            These documents look at APEX internals and how to extend build and extend the platform, and how to add applications.
-                            The guide and howto documents are provided as integrated documentation in the APEX site.
-                            Furthermore, we provide stand-alone documents in HTML and PDF. 
-                        </td>
-                    </tr>
-                </table>
-
-
-            <h3>APEX Modules and Projects</h3>
-                <table>
-                    <tr>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Name</th>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Description</th>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Useful for</th>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/examples/index.html">examples</a></td>
-                        <td>
-                            Example policies and policy models for several use cases, all written for APEX..
-                            Here one can find complete implementations, examples, and tests for APEX policies.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/examples/examples-decisionmaker/index.html">examples-decisionmaker</a> - A simple decision maker demo, with REST interface for interactions deployed in a Docker container</li>
-                                <li><a href="modules/examples/examples-myfirstpolicy/index.html">examples-myfirstpolicy</a> - My First Policy, a step-by-step tutorial for defining a policy</li>
-                                <li><a href="modules/examples/examples-pcvs/index.html">examples-pcvs</a> - An example policy for managing customers and link failures showing video streaming for a simple VPN scenario</li>
-                                <li><a href="modules/examples/examples-onap-vcpe/index.html">examples-onap-vcpe</a> - An example policy for managing vCPE's in ONAP</li>
-                                <li><a href="modules/examples/examples-periodic/index.html">examples-periodic</a> - An example periodic policy</li>
-                                <li><a href="modules/examples/examples-servlet/index.html">examples-servlet</a> - An  APEX Servlet Example</li>
-                                <li><a href="modules/examples/examples-adaptive/index.html">examples-adaptive</a> - A simple adaptive policy</li>
-                                <li><a href="modules/examples/examples-aadm/index.html">examples-aadm</a> - A policy realizing a complex scenario for Autonomic Anomaly Detection and Mitigation (AADM)</li>
-                            </ul>
-                        </td>
-                        <td>Policy Designers, Testers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/client/index.html">clients</a></td>
-                        <td>
-                            Web clients for APEX, including engine monitoring, policy model deployment, and an HTML-based policy editor.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/client/client-editor/index.html">client-editor</a> - APEX REST Editor</li>
-                                <li><a href="modules/client/client-monitoring/index.html">client-monitoring</a> - APEX Monitoring Client</li>
-                                <li><a href="modules/client/client-deployment/index.html">client-deployment</a> - APEX Deployment Client</li>
-                                <li><a href="modules/client/client-full/index.html">client-full</a> - APEX Full Client</li>
-                            </ul>
-                        </td>
-                        <td>APEX users, Developers, Deployers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/auth/index.html">auth</a></td>
-                        <td>
-                            Policy, state, and task authoring for APEX.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/auth/cli-editor/index.html">cli-editor</a> - The APEX CLI Editor</li>
-                                <li><a href="modules/auth/cli-codegen/index.html">cli-codegen</a> - Code-generation tools</li>
-                            </ul>
-                        </td>
-                        <td>Policy Designers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/packages/index.html">packages</a></td>
-                        <td>
-                            The APEX packages, for full deployment (installation package) and Docker deployment.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/packages/apex-pdp-package-full/index.html">package-full</a> - The full deployment module, generates DEB, RPM and TAR deployment artifacts</li>
-                                <li><a href="modules/packages/apex-pdp-docker/index.html">apex-pdp-docker</a> - Creates a Docker deployment artifact</li>
-                            </ul>
-                        </td>
-                        <td>Tester, DevOps, Installers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/tools/index.html">tools</a></td>
-                        <td>
-                            The APEX applications, implementation dependent wrappers and mediation for APEX in various technologies.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/tools/tools-common/index.html">tools-common</a> - Utilities for APEX application developers</li>
-                                <li><a href="modules/tools/model-generator/index.html">model-generator</a> - Generators from/to the APEX policy mode</li>
-                                <li><a href="modules/tools/simple-wsclient/index.html">simple-wsclient</a> - Simple Websocket clients (console and echo) for trigger/actioning systems</li>
-                            </ul>
-                        </td>
-                        <td>Applications developers, DevOps, Installers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/plugins/index.html">plugins</a></td>
-                        <td>
-                            Plugins for APEX that can be implemented with various 3PPs are implemented here.
-                            Most of the APEX engine and system functionality is realized using plug-ins.
-                            These plug-ins are loaded when an APEX policy engine is started.
-                            A configuration specifies which plugins to load.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/plugins/plugins-executor/index.html">plugins-executor</a> - Execution environments for policy logic, such as Javascript, Java, JRuby, Jython, MVEL</li>
-                                <li><a href="modules/plugins/plugins-event/index.html">plugins-event</a> - All event-related plugins: carrier technologies (Kafka, Websocket), event protocols (XML, IBeam)</li>
-                                <li><a href="modules/plugins/plugins-context/index.html">plugins-context</a> - Everything for context: schema (for defining context) distribution (across policies and engines), locking (for writing to context items), persistence</li>
-                                <li><a href="modules/plugins/plugins-persistence/index.html">plugins-persistence</a> - Everything needed for persistence (beside context), mainly JPA plugins for Eclipselink and Hibernate</li>
-                            </ul>
-                        </td>
-                        <td>Plugin developers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/testsuites/index.html">testsuites</a></td>
-                        <td>
-                            APEX testsuites for integration tests, performance tests, and bench marking.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/testsuites/integration/index.html">integration</a> - Packaging for all the Apex components, the engine, the WAR service, and the editor</li>
-                                <li><a href="modules/testsuites/performance/index.html">performance</a> - Packaging for all the Apex components, the engine, the WAR service, and the editor</li>
-                            </ul>
-                        </td>
-                        <td>Service developers, Deployers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/services/index.html">services</a></td>
-                        <td>
-                            The APEX engine as a service, deployment independent.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/services/services-engine/index.html">services-engine</a> - APEX engine service</li>
-                            </ul>
-                        </td>
-                        <td>Service developers, Deployers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/core/index.html">core</a></td>
-                        <td>
-                            The core of APEX, deployment independent.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/core/core-engine/index.html">core-engine</a> - The APEX policy execution engine</li>
-                                <li><a href="modules/core/core-infrastructure/index.html">core-infrastructure</a> - Common non-functional components for APEX</li>
-                                <li><a href="modules/core/core-deployment/index.html">core-deployment</a> - The APEX policy deployer</li>
-                                <li><a href="modules/core/core-protocols/index.html">core-protocols</a> - Protocols used to transfer information between components in APEX</li>
-                            </ul>
-                        </td>
-                        <td>Core APEX developers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/context/index.html">context</a></td>
-                        <td>
-                            The context handling framework of APEX.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/context/context-management/index.html">context-management</a> - Context management for Apex policy execution</li>
-                                <li><a href="modules/context/context-test-utils/index.html">context-test-utils</a> - Test utilities for context</li>
-                            </ul>
-                        </td>
-                        <td>Core APEX developers</td>
-                    </tr>
-
-                    <tr>
-                        <td><a href="modules/model/index.html">model</a></td>
-                        <td>
-                            The model for APEX, it comtains definitions of all APEX concepts, also has handling for APEX policy models.
-                            Important projects here are:
-                            <ul>
-                                <li><a href="modules/model/model-api/index.html">model-api</a> - The APEX Model API with programatic access to a policy model</li>
-                                <li><a href="modules/model/basic-model/index.html">basic-model</a> - Basic Models used and model handling in Apex</li>
-                                <li><a href="modules/model/event-model/index.html">event-model</a> -  Event Models used in APEX </li>
-                                <li><a href="modules/model/policy-model/index.html">policy-model</a> - Policy Models used in APEX</li>
-                                <li><a href="modules/model/engine-model/index.html">engine-model</a> - Engine Models used in APEX</li>
-                                <li><a href="modules/model/context-model/index.html">context-model</a> - Context Models used in APEX</li>
-                                <li><a href="modules/model/utilities/index.html">model-utilities</a> - Common non-functional Apex Model Utilities</li>
-                            </ul>
-                        </td>
-                        <td>Core APEX developers, Application developers (Model API)</td>
-                    </tr>
-                </table>
-
-
-            <h3>APEX Resources</h3>
-                <table>
-                    <tr>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Resource</th>
-                        <th style="white-space:nowrap; font-weight: bold; font-size: 1.25em">Description</th>
-                    </tr>
-                    <tr>
-                        <td><a href="https://gerrit.onap.org/r/#/admin/projects/policy/apex-pdp">APEX Source (ONAP)</a></td>
-                        <td>
-                            The source of APEX is hosted part of the ONAP Policy Framework.
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><a href="https://jira.onap.org/projects/POLICY/issues">APEX Issue Management (ONAP, JIRA)</a></td>
-                        <td>
-                            Issues with the APEX software and integrated documentation are managed here.
-                            This link requires a Linux Foundation ID.
-                        </td>
-                    </tr>
-                </table>
-
-        </section>
-    </body>
-</document>
diff --git a/src/site/xdoc/policy-guide.xml b/src/site/xdoc/policy-guide.xml
deleted file mode 100644
index 9167d393a..000000000
--- a/src/site/xdoc/policy-guide.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<document>
-	<properties>
-		<title>The APEX Policy Guide</title>
-		<author email="sven.van.der.meer@ericsson.com">Sven van der Meer</author>
-		<author email="liam.fallon@ericsson.com">Liam Fallon</author>
-		<author email="john.keeney@ericsson.com">John Keeny</author>
-	</properties>
-	<body>
-
-		<section name="The APEX Policy Guide">
-
-			<p>
-				The APEX policy guide combines a set of howto documents, all supporting APEX and policy, including how to write task and task selection logic.
-				The howto documents are provided as integrated documentation in the APEX site.
-				Furthermore, we provide stand-alone documents in HTML and PDF.
-			</p>
-
-			<p>
-				Note: most of the documentation is written in AsciiDoc.
-				We are using the AsciiDoctor version.
-				Due to the different build tools used for the different documentation targets, the rendered documents differ in style.
-				The content however comes always from a single, normative source located in the APEX source repositories.
-			</p>
-
-			<h3>APEX Policy Guide documentation</h3>
-				<table>
-					<tr>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="20%">Name</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="50%">Description</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="30%">Links</th>
-					</tr>
-					<tr>
-						<td>Policy Guide</td>
-						<td>
-							The complete APEX Policy Guide, including all HowTos and other documentation.
-							The stand-alone versions aggregate all other documents listed in this table.
-						</td>
-						<td>
-							<ul>
-								<li><a href="docs-apex/html/APEX-Policy-Guide.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/APEX-Policy-Guide.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-
-					<tr>
-						<td>The APEX Policy Model</td>
-						<td>
-							A deep dive into the policy model defined and implemented in the APEX engine.
-							This model is the foundation for policy execution.
-						</td>
-						<td>
-							<ul>
-								<li><a href="docs-apex/html/Tech-APEX-PolicyModel.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/Tech-APEX-PolicyModel.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-
-					<tr>
-						<td>HowTo: Policy Logic</td>
-						<td>
-							An APEX policy requires task logic being programmed.
-							When multiple tasks are combined into a single policy state, a so called task selection logic needs to be programmed as well.
-							This HowTo explains how to programme policy task logic and if required task selection logic.
-						</td>
-						<td>
-							<ul>
-								<li><a href="policy-guide/pg-task-logic.html">APEX Site, task logic</a></li>
-								<li><a href="policy-guide/pg-task-selection-logic.html">APEX Site, task selection logic</a></li>
-								<li><a href="policy-guide/pg-logic-cheatsheet.html">APEX Site, logic cheatsheet</a></li>
-								<li><a href="docs-apex/html/HowTo-PolicyLogic.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-PolicyLogic.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-
-				</table>
-		</section>
-	</body>
-</document>
\ No newline at end of file
diff --git a/src/site/xdoc/user-manual.xml b/src/site/xdoc/user-manual.xml
deleted file mode 100644
index 2b34610ff..000000000
--- a/src/site/xdoc/user-manual.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-  
--->
-
-<document>
-	<properties>
-		<title>The APEX User Manual</title>
-		<author email="sven.van.der.meer@ericsson.com">Sven van der Meer</author>
-		<author email="liam.fallon@ericsson.com">Liam Fallon</author>
-		<author email="john.keeney@ericsson.com">John Keeny</author>
-	</properties>
-	<body>
-
-		<section name="The APEX User Manual">
-
-			<p>
-				The APEX user manual combines a set of guides and howto documents, all supporting the use of APEX.
-				The guides and howto documents are provided as integrated documentation in the APEX site.
-				Furthermore, we provide stand-alone documents in HTML and PDF.
-			</p>
-
-			<p>
-				Note: most of the documentation is written in AsciiDoc.
-				We are using the AsciiDoctor version.
-				Due to the different build tools used for the different documentation targets, the rendered documents differ in style.
-				The content however comes always from a single, normative source located in the APEX source repositories.
-			</p>
-
-			<h3>APEX User Manual documentation</h3>
-				<table>
-					<tr>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="20%">Name</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="50%">Description</th>
-						<th style="white-space:nowrap; font-weight: bold; font-size: 1.25em" width="30%">Links</th>
-					</tr>
-					<tr>
-						<td>User Manual</td>
-						<td>
-							The complete APEX User Manual, including all HowTos and other documentation.
-							The stand-alone versions aggregate all other documents listed in this table.
-						</td>
-						<td>
-							<ul>
-								<li><a href="docs-apex/html/APEX-User-Manual.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/APEX-User-Manual.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>Installation Guide</td>
-						<td>
-							The guide with all information on how to get an APEX distribution, install it, configure it, and verify an installation.
-							The guide describes automatic and manual installations on Unix, Windows, and Cygwin.
-							It also has a brief description on how to build APEX from source.
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/install/um-install.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/APEX-Install-Guide.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/APEX-Install-Guide.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: Configure the APEX Engine</td>
-						<td>
-							This HowTo document details all options for configuring an APEX engine.
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/configuration/um-00-introduction.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-Configuration.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-Configuration.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: Run the APEX engine and the provided applications</td>
-						<td>
-							This Howto details the different ways to run an APEX engine.
-							It also shows how the various provided applications (e.g. CLI Editor, REST Editor, WS clients) can be used.
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/engine-apps/um-engapps.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-APEX.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-APEX.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: My First Policy</td>
-						<td>
-							This HowTo is a step-by-step introduction on how to define a policy.
-							The document introduces a non-technical retail scenario and analyzes what requirements a policy will have.
-							Then it shows how a simple policy can be defined, includining all events (trigger and action).
-							It finished with an extension of this simple policy including some context information.
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/my-first-policy/um-mfp-01-introduction.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-MyFirstPolicy.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-MyFirstPolicy.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: Logging</td>
-						<td>
-							The APEX system uses SLF4j for logging with logback as backend.
-							This HowTo explains how the logging can be configured for a number of use cases.
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/logging/um-logging.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-Logging.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-Logging.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-					<tr>
-						<td>HowTo: APEX and Websockets as Carrier Technology</td>
-						<td>
-							This HowTo starts with a brief introduction into Websockets in general, including links to open source Java implementations.
-							Then it explains the different configuration options for an APEX engine when using Websockets.
-							It finishes with an example configuration using the simple Websocket clients (applications).
-						</td>
-						<td>
-							<ul>
-								<li><a href="user-manual/websockets/um-websocket-introduction.html">APEX Site</a></li>
-								<li><a href="docs-apex/html/HowTo-Websockets.html">stand-alone HTML</a></li>
-								<li><a href="docs-apex/pdf/HowTo-Websockets.pdf">stand-alone PDF</a></li>
-							</ul>
-						</td>
-					</tr>
-				</table>
-		</section>
-	</body>
-</document>
\ No newline at end of file
diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index e6dc04db9..5868d4436 100644
--- a/testsuites/apex-pdp-stability/pom.xml
+++ b/testsuites/apex-pdp-stability/pom.xml
@@ -56,21 +56,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index 987d7fc1b..0ec51f3f7 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -97,21 +97,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/testsuites/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/testsuites/integration/integration-common/src/site/css/site.css b/testsuites/integration/integration-common/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/integration/integration-common/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/integration/integration-common/src/site/images/logos.png b/testsuites/integration/integration-common/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/integration/integration-common/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/integration/integration-common/src/site/site.xml b/testsuites/integration/integration-common/src/site/site.xml
deleted file mode 100644
index 595761973..000000000
--- a/testsuites/integration/integration-common/src/site/site.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Integration Common">
-    <body>
-        <menu name="APEX Testsuites Integration Common">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Common" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
diff --git a/testsuites/integration/integration-context-test/pom.xml b/testsuites/integration/integration-context-test/pom.xml
index a117e0553..df33e40c9 100644
--- a/testsuites/integration/integration-context-test/pom.xml
+++ b/testsuites/integration/integration-context-test/pom.xml
@@ -77,21 +77,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/testsuites/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/testsuites/integration/integration-context-test/src/site/css/site.css b/testsuites/integration/integration-context-test/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/integration/integration-context-test/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/integration/integration-context-test/src/site/images/logos.png b/testsuites/integration/integration-context-test/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/integration/integration-context-test/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/integration/integration-context-test/src/site/site.xml b/testsuites/integration/integration-context-test/src/site/site.xml
deleted file mode 100644
index 67f65f06c..000000000
--- a/testsuites/integration/integration-context-test/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Integration Context-Test">
-    <body>
-        <menu name="APEX Testsuites Integration Context-Test">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Context-Test" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/integration/integration-executor-test/pom.xml b/testsuites/integration/integration-executor-test/pom.xml
index bfb178a24..f63f8e030 100644
--- a/testsuites/integration/integration-executor-test/pom.xml
+++ b/testsuites/integration/integration-executor-test/pom.xml
@@ -80,21 +80,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/testsuites/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/testsuites/integration/integration-executor-test/src/site/css/site.css b/testsuites/integration/integration-executor-test/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/integration/integration-executor-test/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/integration/integration-executor-test/src/site/images/logos.png b/testsuites/integration/integration-executor-test/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/integration/integration-executor-test/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/integration/integration-executor-test/src/site/site.xml b/testsuites/integration/integration-executor-test/src/site/site.xml
deleted file mode 100644
index 7a3975bd4..000000000
--- a/testsuites/integration/integration-executor-test/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Integration Executor-Test">
-    <body>
-        <menu name="APEX Testsuites Integration Executor-Test">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Executor-Test" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 048a2ab7a..1ff5d26b9 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -272,20 +272,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/testsuites/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/testsuites/integration/integration-uservice-test/src/site/css/site.css b/testsuites/integration/integration-uservice-test/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/integration/integration-uservice-test/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/integration/integration-uservice-test/src/site/images/logos.png b/testsuites/integration/integration-uservice-test/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/integration/integration-uservice-test/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/integration/integration-uservice-test/src/site/site.xml b/testsuites/integration/integration-uservice-test/src/site/site.xml
deleted file mode 100644
index b26732e9c..000000000
--- a/testsuites/integration/integration-uservice-test/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Integration &micro;service-Test">
-    <body>
-        <menu name="APEX Testsuites Integration &micro;service-Test">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="&micro;service-Test" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index a96d219e1..8c03cba85 100644
--- a/testsuites/integration/pom.xml
+++ b/testsuites/integration/pom.xml
@@ -58,20 +58,5 @@
                 <module>integration-context-test</module>
             </modules>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/testsuites/integration/src/site/css/site.css b/testsuites/integration/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/integration/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/integration/src/site/images/logos.png b/testsuites/integration/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/integration/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/integration/src/site/site.xml b/testsuites/integration/src/site/site.xml
deleted file mode 100644
index 196fee0ea..000000000
--- a/testsuites/integration/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Integration">
-    <body>
-        <menu name="APEX Testsuites Integration">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Integration" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index e34ac84a4..6d1bdb523 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -176,20 +176,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/testsuites/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/testsuites/performance/performance-benchmark-test/src/site/css/site.css b/testsuites/performance/performance-benchmark-test/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/performance/performance-benchmark-test/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/performance/performance-benchmark-test/src/site/images/logos.png b/testsuites/performance/performance-benchmark-test/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/performance/performance-benchmark-test/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/performance/performance-benchmark-test/src/site/site.xml b/testsuites/performance/performance-benchmark-test/src/site/site.xml
deleted file mode 100644
index a12e42d2b..000000000
--- a/testsuites/performance/performance-benchmark-test/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Performance Benchmark-Test">
-    <body>
-        <menu name="APEX Testsuites Performance Benchmark-Test">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Benchmark-Test" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 19aa28807..11da3eb30 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -53,20 +53,5 @@
                 <module>performance-benchmark-test</module>
             </modules>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
diff --git a/testsuites/performance/src/site/css/site.css b/testsuites/performance/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/performance/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/performance/src/site/images/logos.png b/testsuites/performance/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/performance/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/performance/src/site/site.xml b/testsuites/performance/src/site/site.xml
deleted file mode 100644
index 32b899bab..000000000
--- a/testsuites/performance/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites Performance">
-    <body>
-        <menu name="APEX Testsuites Performance">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Performance" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index e5ab27c3e..ec5265c75 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -35,21 +35,4 @@
         <module>performance</module>
         <module>apex-pdp-stability</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/testsuites/src/site/css/site.css b/testsuites/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/testsuites/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/testsuites/src/site/images/logos.png b/testsuites/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/testsuites/src/site/images/logos.png
+++ /dev/null
diff --git a/testsuites/src/site/site.xml b/testsuites/src/site/site.xml
deleted file mode 100644
index dca26885f..000000000
--- a/testsuites/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Testsuites">
-    <body>
-        <menu name="APEX Testsuites">
-        </menu>
-        <menu ref="reports" inherit="top" />
-        <menu ref="modules" />
-
-        <breadcrumbs>
-            <item name="Testsuites" href="index.html" />
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml
index 47fd60903..cb02d35bc 100644
--- a/tools/model-generator/pom.xml
+++ b/tools/model-generator/pom.xml
@@ -178,20 +178,5 @@
                 </pluginManagement>
             </build>
         </profile>
-
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
     </profiles>
 </project>
\ No newline at end of file
diff --git a/tools/model-generator/src/site/css/site.css b/tools/model-generator/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/tools/model-generator/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/tools/model-generator/src/site/images/logos.png b/tools/model-generator/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/tools/model-generator/src/site/images/logos.png
+++ /dev/null
diff --git a/tools/model-generator/src/site/site.xml b/tools/model-generator/src/site/site.xml
deleted file mode 100644
index 2030132a1..000000000
--- a/tools/model-generator/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-<project name="APEX Tools Model-Generators">
-    <body>
-        <menu name="APEX Tools Model-Generators">
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top"/>
-        <menu ref="modules"/>
-
-        <breadcrumbs>
-            <item name="Model-Generators" href="index.html"/>
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/tools/pom.xml b/tools/pom.xml
index 7cef66de3..120097870 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -37,21 +37,4 @@
         <module>simple-wsclient</module>
         <module>model-generator</module>
     </modules>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml
index edbfdec57..19206aba6 100644
--- a/tools/simple-wsclient/pom.xml
+++ b/tools/simple-wsclient/pom.xml
@@ -67,24 +67,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-tools-wsclients-dir>${project.basedir}/src</adsite-tools-wsclients-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
diff --git a/tools/simple-wsclient/src/site/asciidoc/clients.adoc b/tools/simple-wsclient/src/site/asciidoc/clients.adoc
deleted file mode 100644
index fb2842b05..000000000
--- a/tools/simple-wsclient/src/site/asciidoc/clients.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-tools-wsclients-dir}/site-docs/adoc/fragments/clients.adoc[]
diff --git a/tools/simple-wsclient/src/site/asciidoc/run-console.adoc b/tools/simple-wsclient/src/site/asciidoc/run-console.adoc
deleted file mode 100644
index 05c824fc7..000000000
--- a/tools/simple-wsclient/src/site/asciidoc/run-console.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-tools-wsclients-dir}/site-docs/adoc/fragments/run-console.adoc[]
diff --git a/tools/simple-wsclient/src/site/asciidoc/run-echo.adoc b/tools/simple-wsclient/src/site/asciidoc/run-echo.adoc
deleted file mode 100644
index d8091c1c2..000000000
--- a/tools/simple-wsclient/src/site/asciidoc/run-echo.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-tools-wsclients-dir}/site-docs/adoc/fragments/run-echo.adoc[]
diff --git a/tools/simple-wsclient/src/site/css/site.css b/tools/simple-wsclient/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/tools/simple-wsclient/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/tools/simple-wsclient/src/site/images/logos.png b/tools/simple-wsclient/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/tools/simple-wsclient/src/site/images/logos.png
+++ /dev/null
diff --git a/tools/simple-wsclient/src/site/site.xml b/tools/simple-wsclient/src/site/site.xml
deleted file mode 100644
index 03c5f2203..000000000
--- a/tools/simple-wsclient/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-<project name="APEX Tools Simple-WS-Clients">
-    <body>
-        <menu name="APEX Tools Simple-WS-Clients">
-            <item href="clients.html" name="Simple Websocket Clients" />
-            <item href="run-console.html" name="Run Console Client" />
-            <item href="run-echo.html" name="Run Echo Client" />
-
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top"/>
-        <menu ref="modules"/>
-
-        <breadcrumbs>
-            <item name="Simple-WS-Clients" href="index.html"/>
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/tools/src/site/css/site.css b/tools/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/tools/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/tools/src/site/images/logos.png b/tools/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/tools/src/site/images/logos.png
+++ /dev/null
diff --git a/tools/src/site/site.xml b/tools/src/site/site.xml
deleted file mode 100644
index e5e2b5a0d..000000000
--- a/tools/src/site/site.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-
-<project name="APEX Tools">
-    <body>
-        <menu name="APEX Tools">
-        </menu>
-        <menu ref="reports" inherit="top"/>
-        <menu ref="modules"/>
-
-        <breadcrumbs>
-            <item name="Tools" href="index.html"/>
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file
diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml
index aec342fbe..0ce6f93de 100644
--- a/tools/tools-common/pom.xml
+++ b/tools/tools-common/pom.xml
@@ -72,24 +72,4 @@
             </resource>
         </resources>
     </build>
-
-    <profiles>
-        <profile>
-            <id>apexSite</id>
-            <activation>
-                <property>
-                    <name>apexSite</name>
-                </property>
-            </activation>
-            <properties>
-                <adsite-tools-common-dir>${project.basedir}/src</adsite-tools-common-dir>
-            </properties>
-            <distributionManagement>
-                <site>
-                    <id>${project.artifactId}-site</id>
-                    <url>${apex.adsite.prefix}/modules/${project.parent.artifactId}/${project.artifactId}/</url>
-                </site>
-            </distributionManagement>
-        </profile>
-    </profiles>
 </project>
\ No newline at end of file
diff --git a/tools/tools-common/src/site/asciidoc/example-cli-version.adoc b/tools/tools-common/src/site/asciidoc/example-cli-version.adoc
deleted file mode 100644
index 83183e8ee..000000000
--- a/tools/tools-common/src/site/asciidoc/example-cli-version.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-tools-common-dir}/site-docs/adoc/fragments/example-cli-version.adoc[]
diff --git a/tools/tools-common/src/site/asciidoc/example-cli.adoc b/tools/tools-common/src/site/asciidoc/example-cli.adoc
deleted file mode 100644
index 3d7808d79..000000000
--- a/tools/tools-common/src/site/asciidoc/example-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-tools-common-dir}/site-docs/adoc/fragments/example-cli.adoc[]
diff --git a/tools/tools-common/src/site/css/site.css b/tools/tools-common/src/site/css/site.css
deleted file mode 100644
index ef8bd4d15..000000000
--- a/tools/tools-common/src/site/css/site.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.0/css/font-awesome.css);
-
-
-/*************** Table definitions *******************/
-
-tableblock > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
-
-.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
-
-table.tableblock { background: white; margin-bottom: 1.25em; border: solid 1px #dddddd; }
-table.tableblock thead, table.tableblock tfoot { background: whitesmoke; font-weight: bold; }
-table.tableblock thead tr th, table.tableblock thead tr td, table tfoot tr th, table tfoot tr td { padding: 0.5em 0.625em 0.625em; font-size: inherit; color: #222222; text-align: left; }
-table.tableblock tr th, table.tableblock tr td { padding: 0.5625em 0.625em; font-size: inherit; color: #222222; }
-table.tableblock tr.even, table.tableblock tr.alt, table.tableblock tr:nth-of-type(even) { background: #f9f9f9; }
-table.tableblock thead tr th, table.tableblock tfoot tr th, table.tableblock tbody tr td, table.tableblock tr td, table.tableblock tfoot tr td { display: table-cell; line-height: 1.6; }
-
-table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
-
-table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 4px; border-radius: 4px; border-top: 1px solid #dddddd; border-bottom: 1px solid #dddddd; }
-
-table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
-
-table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
-
-table.tableblock td .paragraph:last-child p, table.tableblock td > p:last-child { margin-bottom: 0; }
-
-th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
-
-th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
-
-th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
-
-th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
-
-th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
-
-th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
-
-p.tableblock.header { color: #222222; font-weight: bold; }
-
-
-
-/*************** KBD Macro definitions *******************/
-
-kbd.keyseq { color: #555555; }
-
-kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
-
-kbd kbd:first-child { margin-left: 0; }
-
-kbd kbd:last-child { margin-right: 0; }
-
-
-/*************** Admontion Blocks definitions *******************/
-.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .videoblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
-
-.admonitionblock > table { border: 0; background: none; width: 100%; margin-top: 1em; margin-bottom: 1em;}
-.admonitionblock > table td.icon { text-align: center; width: 80px; }
-.admonitionblock > table td.icon img { max-width: none; }
-.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
-.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #6f6f6f; }
-.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
-
-.admonitionblock td.icon [class^="fa icon-"]:before {font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
-.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
-.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
-.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
-.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
-
-
-
-/*************** Misc definitions *******************/
-
-*:not(pre) > code { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
-
-pre, pre > code { line-height: 1.4; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; }
-
-code { font-family: Consolas, "Liberation Mono", Courier, monospace; font-weight: normal; color: #6d180b; }
-
diff --git a/tools/tools-common/src/site/images/logos.png b/tools/tools-common/src/site/images/logos.png
deleted file mode 100644
index 915d6e59d..000000000
--- a/tools/tools-common/src/site/images/logos.png
+++ /dev/null
diff --git a/tools/tools-common/src/site/site.xml b/tools/tools-common/src/site/site.xml
deleted file mode 100644
index 8d6a38325..000000000
--- a/tools/tools-common/src/site/site.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============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)
-
--->
-<project name="APEX Tools Common">
-    <body>
-        <menu name="APEX Tools Common">
-            <item href="example-cli.html" name="CLI Example" />
-            <item href="example-cli-version.html" name="Autoversion Example" />
-
-            <item href="javadocs/index.html" name="API Doc" />
-        </menu>
-        <menu ref="reports" inherit="top"/>
-        <menu ref="modules"/>
-
-        <breadcrumbs>
-            <item name="Common" href="index.html"/>
-        </breadcrumbs>
-    </body>
-</project>
\ No newline at end of file