diff --git a/core/pom.xml b/core/pom.xml
index 8b8bcaf6..71532447 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -51,13 +51,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <doclet>org.jboss.apiviz.APIviz</doclet>
-                    <docletArtifact>
-                        <groupId>org.jboss.apiviz</groupId>
-                        <artifactId>apiviz</artifactId>
-                        <version>${version.apiviz}</version>
-                    </docletArtifact>
-                    <useStandardDocletOptions>true</useStandardDocletOptions>
                     <charset>UTF-8</charset>
                     <encoding>UTF-8</encoding>
                     <docencoding>UTF-8</docencoding>
@@ -66,7 +59,7 @@
                     <author>true</author>
                     <keywords>true</keywords>
                     <additionalOptions>
-                        -sourceclasspath ${project.build.outputDirectory}
+                        --allow-script-in-comments
                     </additionalOptions>
                     <docfilessubdirs>true</docfilessubdirs>
                     <top><![CDATA[
@@ -74,14 +67,14 @@
                          <script src="doc-files/shCore.js" type="text/javascript"></script>
                          <script src="doc-files/shBrushJava.js" type="text/javascript"></script>
                     ]]></top>
-                    <footer><![CDATA[
+                    <bottom><![CDATA[
                          <script type="text/javascript">
                            SyntaxHighlighter.defaults["auto-links"] = false;
                            SyntaxHighlighter.defaults["gutter"] = false;
                            SyntaxHighlighter.defaults["toolbar"] = false;
                            SyntaxHighlighter.all();
                          </script>
-                    ]]></footer>
+                    ]]></bottom>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/core/src/main/java/org/jboss/jandex/Index.java b/core/src/main/java/org/jboss/jandex/Index.java
index e70f3339..578a315d 100644
--- a/core/src/main/java/org/jboss/jandex/Index.java
+++ b/core/src/main/java/org/jboss/jandex/Index.java
@@ -478,7 +478,7 @@ public List<ClassInfo> getKnownUsers(DotName className) {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     @Override
     public Collection<ClassInfo> getClassesInPackage(DotName packageName) {
@@ -500,7 +500,7 @@ public Collection<ClassInfo> getClassesInPackage(DotName packageName) {
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     @Override
     public Set<DotName> getSubpackages(DotName packageName) {
diff --git a/pom.xml b/pom.xml
index 10252071..e313c8bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
         <maven.compiler.target>1.8</maven.compiler.target>
 
         <version.ant>1.10.11</version.ant>
-        <version.apiviz>1.3.2.GA</version.apiviz>
         <version.bridger>1.6.Final</version.bridger>
         <version.bytebuddy>1.11.13</version.bytebuddy>
         <version.exec-maven-plugin>3.0.0</version.exec-maven-plugin>