diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/inbandtelemetry/IntReportConfig.java b/core/api/src/main/java/org/onosproject/net/behaviour/inbandtelemetry/IntReportConfig.java
index 95a8fe5..9575607 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/inbandtelemetry/IntReportConfig.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/inbandtelemetry/IntReportConfig.java
@@ -82,7 +82,7 @@
      * This value is used to instruct an INT-capable device to produce reports
      * only for packets which hop latency changed by at least minFlowHopLatencyChangeNs
      * from the previously reported value for the same flow (5-tuple), i.e., produce a
-     * report only if `(currentHopLatency - previousHopLatency) > minFlowHopLatencyChangeNs`.
+     * report only if `(currentHopLatency - previousHopLatency) &gt; minFlowHopLatencyChangeNs`.
      * Some device implementations might support only specific intervals, e.g., powers of 2.
      *
      * @return Interval in nanoseconds
diff --git a/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java b/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
index 2836caf..aabe7a4 100644
--- a/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
+++ b/core/api/src/main/java/org/onosproject/store/service/TransactionalSet.java
@@ -5,7 +5,7 @@
  * 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
+ *     hcodep://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,
@@ -29,43 +29,43 @@
     /**
      * Adds the specified element to this set if it is not already present
      * (optional operation).  More formally, adds the specified element
-     * <tt>e</tt> to this set if the set contains no element <tt>e2</tt>
+     * <code>e</code> to this set if the set contains no element <code>e2</code>
      * such that
-     * <tt>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</tt>.
+     * <code>(e==null&nbsp;?&nbsp;e2==null&nbsp;:&nbsp;e.equals(e2))</code>.
      * If this set already contains the element, the call leaves the set
-     * unchanged and returns <tt>false</tt>.  In combination with the
+     * unchanged and returns <code>false</code>.  In combination with the
      * restriction on constructors, this ensures that sets never contain
      * duplicate elements.
      *
      * @param e element to be added to this set
-     * @return <tt>true</tt> if this set did not already contain the specified
+     * @return <code>true</code> if this set did not already contain the specified
      *         element
      */
     boolean add(E e);
 
     /**
      * Removes the specified element from this set if it is present
-     * (optional operation).  More formally, removes an element <tt>e</tt>
+     * (optional operation).  More formally, removes an element <code>e</code>
      * such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>, if
-     * this set contains such an element.  Returns <tt>true</tt> if this set
+     * <code>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</code>, if
+     * this set contains such an element.  Returns <code>true</code> if this set
      * contained the element (or equivalently, if this set changed as a
      * result of the call).  (This set will not contain the element once the
      * call returns.)
      *
      * @param e element to be removed to this set
-     * @return <tt>true</tt> if this set contained the specified element
+     * @return <code>true</code> if this set contained the specified element
      */
     boolean remove(E e);
 
     /**
-     * Returns <tt>true</tt> if this set contains the specified element.
-     * More formally, returns <tt>true</tt> if and only if this set
-     * contains an element <tt>e</tt> such that
-     * <tt>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</tt>.
+     * Returns <code>true</code> if this set contains the specified element.
+     * More formally, returns <code>true</code> if and only if this set
+     * contains an element <code>e</code> such that
+     * <code>(o==null&nbsp;?&nbsp;e==null&nbsp;:&nbsp;o.equals(e))</code>.
      *
      * @param e element whose presence in this set is to be tested
-     * @return <tt>true</tt> if this set contains the specified element
+     * @return <code>true</code> if this set contains the specified element
      * @throws ClassCastException if the type of the specified element
      *         is incompatible with this set
      * @throws NullPointerException if the specified element is null and this
diff --git a/docs/BUILD b/docs/BUILD
index bb37e3a..2d26440 100644
--- a/docs/BUILD
+++ b/docs/BUILD
@@ -23,63 +23,6 @@
     "//apps/dhcp/api:onos-apps-dhcp-api-sources",
 ]
 
-INTERNAL_SOURCES = [
-    "//protocols/rest/api:onos-protocols-rest-api-sources",
-    "//protocols/rest/ctl:onos-protocols-rest-ctl-sources",
-    "//protocols/bgp/bgpio:onos-protocols-bgp-bgpio-sources",
-    "//protocols/bgp/api:onos-protocols-bgp-api-sources",
-    "//protocols/bgp/ctl:onos-protocols-bgp-ctl-sources",
-    "//protocols/netconf/api:onos-protocols-netconf-api-sources",
-    "//protocols/netconf/ctl:onos-protocols-netconf-ctl-sources",
-    "//protocols/openflow/api:onos-protocols-openflow-api-sources",
-    "//protocols/openflow/ctl:onos-protocols-openflow-ctl-sources",
-    "//protocols/ospf/api:onos-protocols-ospf-api-sources",
-    "//protocols/ospf/protocol:onos-protocols-ospf-protocol-sources",
-    "//protocols/ospf/ctl:onos-protocols-ospf-ctl-sources",
-    "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc-sources",
-    "//protocols/ovsdb/api:onos-protocols-ovsdb-api-sources",
-    "//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl-sources",
-    # "//protocols/p4runtime/api:onos-protocols-p4runtime-api-sources",
-    # "//protocols/p4runtime/model:onos-protocols-p4runtime-model-sources",
-    "//protocols/pcep/pcepio:onos-protocols-pcep-pcepio-sources",
-    "//protocols/pcep/server/api:onos-protocols-pcep-server-api-sources",
-    "//protocols/pcep/server/ctl:onos-protocols-pcep-server-ctl-sources",
-    "//protocols/snmp/api:onos-protocols-snmp-api-sources",
-    "//protocols/snmp/ctl:onos-protocols-snmp-ctl-sources",
-    "//protocols/isis/api:onos-protocols-isis-api-sources",
-    "//protocols/isis/ctl:onos-protocols-isis-ctl-sources",
-    "//protocols/isis/isisio:onos-protocols-isis-isisio-sources",
-    "//protocols/lisp/api:onos-protocols-lisp-api-sources",
-    "//protocols/lisp/ctl:onos-protocols-lisp-ctl-sources",
-    "//protocols/lisp/msg:onos-protocols-lisp-msg-sources",
-    "//protocols/tl1/api:onos-protocols-tl1-api-sources",
-    "//protocols/tl1/ctl:onos-protocols-tl1-ctl-sources",
-    "//protocols/restconf/client/api:onos-protocols-restconf-client-api-sources",
-    "//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl-sources",
-    "//protocols/xmpp/core/api:onos-protocols-xmpp-core-api-sources",
-    "//protocols/xmpp/core/ctl:onos-protocols-xmpp-core-ctl-sources",
-    "//drivers/utilities:onos-drivers-utilities-sources",
-    "//providers/netconf/device:onos-providers-netconf-device-sources",
-    "//providers/openflow/device:onos-providers-openflow-device-sources",
-    "//providers/openflow/packet:onos-providers-openflow-packet-sources",
-    "//providers/openflow/flow:onos-providers-openflow-flow-sources",
-    "//providers/openflow/group:onos-providers-openflow-group-sources",
-    "//providers/openflow/meter:onos-providers-openflow-meter-sources",
-    "//providers/ovsdb/device:onos-providers-ovsdb-device-sources",
-    "//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel-sources",
-    "//providers/rest/device:onos-providers-rest-device-sources",
-    "//providers/snmp/device:onos-providers-snmp-device-sources",
-    "//providers/isis/cfg:onos-providers-isis-cfg-sources",
-    "//providers/isis/topology:onos-providers-isis-topology-sources",
-    "//providers/lisp/device:onos-providers-lisp-device-sources",
-    "//providers/tl1/device:onos-providers-tl1-device-sources",
-    "//providers/general/device:onos-providers-general-device-sources",
-    # "//providers/p4runtime/packet:onos-providers-p4runtime-packet-sources",
-    "//apps/pcep-api:onos-apps-pcep-api-sources",
-    "//apps/optical-model:onos-apps-optical-model-sources",
-    "//apps/mappingmanagement/api:onos-apps-mappingmanagement-api-sources",
-]
-
 JAVADOC_DEPS = CORE_DEPS + KRYO + ATOMIX + REST + CLI + JACKSON + TEST + NETTY + METRICS + ONOS_YANG + [
     "@io_netty_netty//jar",
     "@io_netty_netty_codec//jar",
@@ -122,156 +65,6 @@
     ],
 }
 
-INTERNAL_GROUPS = {
-    "Network Model &amp; Services": ["org.onosproject.*"],
-    "Incubator for Network Model &amp; Services": ["org.onosproject.incubator.*"],
-    "Core Subsystems": [
-        "org.onosproject.cfg.impl",
-        "org.onosproject.cluster.impl",
-        "org.onosproject.core.impl",
-        "org.onosproject.event.impl",
-        "org.onosproject.net.config.impl",
-        "org.onosproject.net.device.impl",
-        "org.onosproject.net.driver.impl",
-        "org.onosproject.net.edgeservice.impl",
-        "org.onosproject.net.flow.impl",
-        "org.onosproject.net.flowobjective.impl",
-        "org.onosproject.net.flowobjective.impl.composition",
-        "org.onosproject.net.group.impl",
-        "org.onosproject.net.host.impl",
-        "org.onosproject.net.intent.impl",
-        "org.onosproject.net.intent.impl.compiler",
-        "org.onosproject.net.intent.impl.phase",
-        "org.onosproject.net.intf.impl",
-        "org.onosproject.net.link.impl",
-        "org.onosproject.net.newresource.impl",
-        "org.onosproject.net.packet.impl",
-        "org.onosproject.net.proxyarp.impl",
-        "org.onosproject.net.resource.impl",
-        "org.onosproject.net.statistic.impl",
-        "org.onosproject.net.topology.impl",
-        "org.onosproject.json",
-        "org.onosproject.json.*",
-        "org.onosproject.common.*",
-        # "org.onosproject.security.impl",
-        # "org.onosproject.security.store",
-    ],
-    "Distributed Stores": [
-        "org.onosproject.store.*",
-        "org.onosproject.persistence.impl",
-    ],
-    "Utilities": ["org.onlab.*"],
-    "GUI, REST &amp; Command-Line": [
-        "org.onosproject.ui.impl*",
-        "org.onosproject.rest.*",
-        "org.onosproject.cli*",
-        "org.onosproject.codec.impl",
-    ],
-    "Builtin Applications": [
-        "org.onosproject.app.*",
-        "org.onosproject.acl*",
-        "org.onosproject.aaa",
-        "org.onosproject.fwd",
-        "org.onosproject.dhcp*",
-        "org.onosproject.flowanalyzer",
-        "org.onosproject.cpman*",
-        "org.onosproject.mobility",
-        "org.onosproject.proxyarp",
-        "org.onosproject.calendar",
-        "org.onosproject.olt*",
-        "org.onosproject.optical*",
-        "org.onosproject.newoptical*",
-        "org.onosproject.sdnip",
-        "org.onosproject.sdnip.*",
-        "org.onosproject.config",
-        "org.onosproject.routing",
-        "org.onosproject.routing*",
-        "org.onosproject.bgprouter",
-        "org.onosproject.segmentrouting*",
-        "org.onosproject.reactive.routing*",
-        "org.onosproject.messagingperf",
-        "org.onosproject.virtualbng*",
-        "org.onosproject.cordfabric*",
-        "org.onosproject.xosintegration*",
-        "org.onosproject.cip*",
-        "org.onosproject.vtn*",
-        "org.onosproject.cord*",
-        "org.onosproject.mcast*",
-        "org.onosproject.mfwd*",
-        "org.onosproject.mlb*",
-        "org.onosproject.igmp*",
-        "org.onosproject.pim*",
-        "org.onosproject.vpls*",
-        "org.onosproject.vrouter*",
-        "org.onosproject.faultmanagement*",
-        "org.onosproject.iptopology*",
-        "org.onosproject.drivermatrix*",
-        "org.onosproject.pathpainter*",
-        "org.onosproject.openstack*",
-        "org.onosproject.scalablegateway*",
-        "org.onosproject.forwarder*",
-        "org.onosproject.sfc*",
-        "org.onosproject.netcfgmonitor*",
-        "org.onosproject.flowperf",
-        "org.onosproject.loadtest",
-        "org.onosproject.events",
-        "org.onosproject.bmv2*",
-        "org.onosproject.xosclient*",
-        "org.onosproject.kafkaintegration*",
-        "org.onosproject.gangliametrics*",
-        "org.onosproject.graphitemetrics*",
-        "org.onosproject.influxdbmetrics*",
-        "org.onosproject.yms*",
-    ],
-    "Test Instrumentation &amp; Applications": [
-        "org.onosproject.metrics.*",
-        "org.onosproject.demo*",
-        "org.onosproject.election*",
-        "org.onosproject.distributedprimitives*",
-        "org.onosproject.intentperf*",
-        "org.onosproject.messagingperf*",
-        "org.onosproject.optical.testapp*",
-    ],
-    "OpenFlow Providers &amp; Controller": [
-        "org.onosproject.openflow.*",
-        "org.onosproject.provider.of.*",
-    ],
-    "NetConf Protocol &amp; Providers": [
-        "org.onosproject.netconf*",
-        "org.onosproject.provider.netconf*",
-    ],
-    "OVSDB Protocol &amp; Providers": [
-        "org.onosproject.provider.ovsdb*",
-        "org.onosproject.ovsdb*",
-    ],
-    "PCEP Protocol &amp; Providers": [
-        "org.onosproject.pce.*",
-        "org.onosproject.pcerest*",
-        "org.onosproject.pceweb*",
-        "org.onosproject.pcep*",
-        "org.onosproject.pcepio*",
-        "org.onosproject.provider.pcep*",
-    ],
-    "BGP-LS Protocol &amp; Providers": [
-        "org.onosproject.bgp.controller*",
-        "org.onosproject.bgp*",
-        "org.onosproject.provider.bgp*",
-    ],
-    "OSPF Protocol &amp; Providers": ["org.onosproject.ospf*"],
-    "ISIS Protocol &amp; Providers": ["org.onosproject.isis*"],
-    "LISP Protocol &amp; Providers": ["org.onosproject.lisp*"],
-    "SNMP Protocol &amp; Providers": ["org.onosproject.snmp*"],
-    "REST Protocol &amp; Providers": [
-        "org.onosproject.protocol.rest*",
-        "org.onosproject.provider.rest*",
-    ],
-    "Other Providers": [
-        "org.onosproject.provider.*",
-        "org.onosproject.protocol.*",
-    ],
-    "Device Drivers": ["org.onosproject.driver*"],
-}
-
 project_javadoc(
     name = "external",
     srcs = SOURCES,
@@ -279,12 +72,3 @@
     title = "ONOS Java API (%s)" % ONOS_VERSION,
     deps = JAVADOC_DEPS,
 )
-
-project_javadoc(
-    name = "internal",
-    srcs = SOURCES + INTERNAL_SOURCES,
-    groups = INTERNAL_GROUPS,
-    internal = True,
-    title = "ONOS Java API (%s)" % ONOS_VERSION,
-    deps = JAVADOC_DEPS,
-)
diff --git a/docs/internal-apis b/docs/internal-apis
deleted file mode 100644
index a35d093..0000000
--- a/docs/internal-apis
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject
-org.onosproject.*
diff --git a/docs/internal-apps b/docs/internal-apps
deleted file mode 100644
index 1f46702..0000000
--- a/docs/internal-apps
+++ /dev/null
@@ -1,55 +0,0 @@
-org.onosproject.app.*
-
-org.onosproject.acl*
-org.onosproject.aaa
-org.onosproject.fwd
-org.onosproject.dhcp*
-org.onosproject.flowanalyzer
-org.onosproject.cpman*
-org.onosproject.mobility
-org.onosproject.proxyarp
-org.onosproject.calendar
-org.onosproject.olt*
-org.onosproject.optical*
-org.onosproject.newoptical*
-org.onosproject.sdnip
-org.onosproject.sdnip.*
-org.onosproject.config
-org.onosproject.routing
-org.onosproject.routing*
-org.onosproject.bgprouter
-org.onosproject.segmentrouting*
-org.onosproject.reactive.routing*
-org.onosproject.messagingperf
-org.onosproject.virtualbng*
-org.onosproject.cordfabric*
-org.onosproject.xosintegration*
-org.onosproject.cip*
-org.onosproject.vtn*
-org.onosproject.cord*
-org.onosproject.mcast*
-org.onosproject.mfwd*
-org.onosproject.mlb*
-org.onosproject.igmp*
-org.onosproject.pim*
-org.onosproject.vpls*
-org.onosproject.vrouter*
-org.onosproject.faultmanagement*
-org.onosproject.iptopology*
-org.onosproject.drivermatrix*
-org.onosproject.pathpainter*
-org.onosproject.openstack*
-org.onosproject.scalablegateway*
-org.onosproject.forwarder*
-org.onosproject.sfc*
-org.onosproject.netcfgmonitor*
-org.onosproject.flowperf
-org.onosproject.loadtest
-org.onosproject.events
-org.onosproject.bmv2*
-org.onosproject.xosclient*
-org.onosproject.kafkaintegration*
-org.onosproject.gangliametrics*
-org.onosproject.graphitemetrics*
-org.onosproject.influxdbmetrics*
-org.onosproject.yms*
diff --git a/docs/internal-bgpls b/docs/internal-bgpls
deleted file mode 100644
index 25bf23c..0000000
--- a/docs/internal-bgpls
+++ /dev/null
@@ -1,3 +0,0 @@
-org.onosproject.bgp.controller*
-org.onosproject.bgp*
-org.onosproject.provider.bgp*
diff --git a/docs/internal-core b/docs/internal-core
deleted file mode 100644
index f987aa9..0000000
--- a/docs/internal-core
+++ /dev/null
@@ -1,28 +0,0 @@
-org.onosproject.cfg.impl
-org.onosproject.cluster.impl
-org.onosproject.core.impl
-org.onosproject.event.impl
-org.onosproject.net.config.impl
-org.onosproject.net.device.impl
-org.onosproject.net.driver.impl
-org.onosproject.net.edgeservice.impl
-org.onosproject.net.flow.impl
-org.onosproject.net.flowobjective.impl
-org.onosproject.net.flowobjective.impl.composition
-org.onosproject.net.group.impl
-org.onosproject.net.host.impl
-org.onosproject.net.intent.impl
-org.onosproject.net.intent.impl.compiler
-org.onosproject.net.intent.impl.phase
-org.onosproject.net.link.impl
-org.onosproject.net.newresource.impl
-org.onosproject.net.packet.impl
-org.onosproject.net.proxyarp.impl
-org.onosproject.net.resource.impl
-org.onosproject.net.statistic.impl
-org.onosproject.net.topology.impl
-org.onosproject.json
-org.onosproject.json.*
-org.onosproject.common.*
-org.onosproject.security.impl
-org.onosproject.security.store
diff --git a/docs/internal-drivers b/docs/internal-drivers
deleted file mode 100644
index 90cf08d..0000000
--- a/docs/internal-drivers
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.driver*
diff --git a/docs/internal-excludes b/docs/internal-excludes
deleted file mode 100644
index 7ac0a66..0000000
--- a/docs/internal-excludes
+++ /dev/null
@@ -1,9 +0,0 @@
-org.onlab.jdvue*
-org.onlab.stc*
-org.onlab.catalyst*
-org.onlab.atomix
-org.onosproject.oecfg
-org.onosproject.maven
-org.onosproject.grpc*
-org.onosproject.yangutils.*
-protobuf.*
diff --git a/docs/internal-gui-rest-cli b/docs/internal-gui-rest-cli
deleted file mode 100644
index 7b529c0..0000000
--- a/docs/internal-gui-rest-cli
+++ /dev/null
@@ -1,4 +0,0 @@
-org.onosproject.ui.impl*
-org.onosproject.rest.*
-org.onosproject.cli*
-org.onosproject.codec.impl
diff --git a/docs/internal-incubator b/docs/internal-incubator
deleted file mode 100644
index 1f677a5..0000000
--- a/docs/internal-incubator
+++ /dev/null
@@ -1,12 +0,0 @@
-org.onosproject.incubator.net.impl
-org.onosproject.incubator.store.impl
-org.onosproject.incubator.net.resource.label.impl
-org.onosproject.incubator.store.resource.impl
-org.onosproject.incubator.net.tunnel.impl
-org.onosproject.incubator.store.tunnel.impl
-org.onosproject.incubator.net.config.impl
-org.onosproject.incubator.net.domain.impl
-org.onosproject.incubator.store.config.impl
-org.onosproject.incubator.net.meter.impl
-org.onosproject.incubator.net.resource.label
-org.onosproject.incubator.store.meter.impl
diff --git a/docs/internal-incubator-apis b/docs/internal-incubator-apis
deleted file mode 100644
index df9ddbc..0000000
--- a/docs/internal-incubator-apis
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.incubator*
diff --git a/docs/internal-isis b/docs/internal-isis
deleted file mode 100644
index ecd7a36..0000000
--- a/docs/internal-isis
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.isis*
diff --git a/docs/internal-lisp b/docs/internal-lisp
deleted file mode 100644
index 23e8e51..0000000
--- a/docs/internal-lisp
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.lisp*
diff --git a/docs/internal-netconf b/docs/internal-netconf
deleted file mode 100644
index 161ad9c..0000000
--- a/docs/internal-netconf
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.netconf*
-org.onosproject.provider.netconf*
diff --git a/docs/internal-openflow b/docs/internal-openflow
deleted file mode 100644
index c84cf13..0000000
--- a/docs/internal-openflow
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.openflow.*
-org.onosproject.provider.of.*
diff --git a/docs/internal-ospf b/docs/internal-ospf
deleted file mode 100644
index 7fec14e..0000000
--- a/docs/internal-ospf
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.ospf*
diff --git a/docs/internal-ovsdb b/docs/internal-ovsdb
deleted file mode 100644
index 4b4ccb7..0000000
--- a/docs/internal-ovsdb
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.provider.ovsdb*
-org.onosproject.ovsdb*
diff --git a/docs/internal-pcep b/docs/internal-pcep
deleted file mode 100644
index f559bb0..0000000
--- a/docs/internal-pcep
+++ /dev/null
@@ -1,6 +0,0 @@
-org.onosproject.pce.*
-org.onosproject.pcerest*
-org.onosproject.pceweb*
-org.onosproject.pcep*
-org.onosproject.pcepio*
-org.onosproject.provider.pcep*
diff --git a/docs/internal-providers b/docs/internal-providers
deleted file mode 100644
index 11871cd..0000000
--- a/docs/internal-providers
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.provider.*
-org.onosproject.protocol.*
diff --git a/docs/internal-restsb b/docs/internal-restsb
deleted file mode 100644
index 971c843..0000000
--- a/docs/internal-restsb
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.protocol.rest*
-org.onosproject.provider.rest*
diff --git a/docs/internal-snmp b/docs/internal-snmp
deleted file mode 100644
index c4629bb..0000000
--- a/docs/internal-snmp
+++ /dev/null
@@ -1 +0,0 @@
-org.onosproject.snmp*
diff --git a/docs/internal-stores b/docs/internal-stores
deleted file mode 100644
index 1f1f05a..0000000
--- a/docs/internal-stores
+++ /dev/null
@@ -1,2 +0,0 @@
-org.onosproject.store.*
-org.onosproject.persistence.impl
diff --git a/docs/internal-test-apps b/docs/internal-test-apps
deleted file mode 100644
index bc5276c..0000000
--- a/docs/internal-test-apps
+++ /dev/null
@@ -1,7 +0,0 @@
-org.onosproject.metrics.*
-org.onosproject.demo*
-org.onosproject.election*
-org.onosproject.distributedprimitives*
-org.onosproject.intentperf*
-org.onosproject.messagingperf*
-org.onosproject.optical.testapp*
diff --git a/tools/build/bazel/javadoc.bzl b/tools/build/bazel/javadoc.bzl
index c459f7d..6493160 100644
--- a/tools/build/bazel/javadoc.bzl
+++ b/tools/build/bazel/javadoc.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JAVA_DOCS = "-link https://docs.oracle.com/javase/11/docs/api/"
+JAVA_DOCS = "-link https://docs.oracle.com/en/java/javase/11/docs/api/"
 
 def _impl(ctx):
     dir = ctx.label.name
diff --git a/tools/build/bazel/project_javadoc.bzl b/tools/build/bazel/project_javadoc.bzl
index 7c706d0..25f91fe 100644
--- a/tools/build/bazel/project_javadoc.bzl
+++ b/tools/build/bazel/project_javadoc.bzl
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-JAVA_DOCS = "-link https://docs.oracle.com/javase/11/docs/api/"
+JAVA_DOCS = "-link https://docs.oracle.com/en/java/javase/11/docs/api/"
 
 def dump(obj):
     print(dir(obj))
diff --git a/tools/build/onos-change-version b/tools/build/onos-change-version
index a0dad83..b07d107 100755
--- a/tools/build/onos-change-version
+++ b/tools/build/onos-change-version
@@ -3,7 +3,7 @@
 # Changes ONOS version in POM files, and other release artifacts.
 # -----------------------------------------------------------------------------
 
-set -e
+set -ex
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 . $ONOS_ROOT/tools/build/envDefaults