diff --git a/src/main/java/io/apicurio/datamodels/Library.java b/src/main/java/io/apicurio/datamodels/Library.java
index 8bf9180a6..6b353b85c 100755
--- a/src/main/java/io/apicurio/datamodels/Library.java
+++ b/src/main/java/io/apicurio/datamodels/Library.java
@@ -53,7 +53,7 @@
  * The most common entry points into using the data models library.  Provides convenience methods
  * for performing common actions such as i/o, visiting, and validation.
  * @author eric.wittmann@gmail.com
- * @author Jakub Senko <jsenko@redhat.com>
+ * @author jsenko@redhat.com
  */
 public class Library {
 
diff --git a/src/main/java/io/apicurio/datamodels/cmd/commands/SetPropertyCommand.java b/src/main/java/io/apicurio/datamodels/cmd/commands/SetPropertyCommand.java
index 18d2d2546..446ccb843 100755
--- a/src/main/java/io/apicurio/datamodels/cmd/commands/SetPropertyCommand.java
+++ b/src/main/java/io/apicurio/datamodels/cmd/commands/SetPropertyCommand.java
@@ -7,7 +7,7 @@
  * A command used to modify the simple property of a node.  Should not be used
  * to modify complex (object) properties, only simple property types like
  * string, boolean, number, etc.  This differs from {@link ChangePropertyCommand}
- * in that it can be constructed from a {@link NodePath} rather than a {@link Node}
+ * in that it can be constructed from a {@link NodePath} rather than a {@link io.apicurio.datamodels.models.Node}
  * and therefore can be used in {@link AggregateCommand} use-cases where there is
  * a Create followed by a SetProperty.
  * 
@@ -22,7 +22,7 @@ public SetPropertyCommand() {
     }
 
     /**
-     * C'tor.
+     * Constructor.
      */
     public SetPropertyCommand(NodePath nodePath, String property, T newValue) {
         super();
diff --git a/src/main/java/io/apicurio/datamodels/refs/LocalReferenceResolver.java b/src/main/java/io/apicurio/datamodels/refs/LocalReferenceResolver.java
index 9b6da2e7c..20b331598 100755
--- a/src/main/java/io/apicurio/datamodels/refs/LocalReferenceResolver.java
+++ b/src/main/java/io/apicurio/datamodels/refs/LocalReferenceResolver.java
@@ -29,9 +29,6 @@
  */
 public class LocalReferenceResolver implements IReferenceResolver {
 
-    /**
-     * @see io.apicurio.datamodels.core.util.IReferenceResolver#resolveRef(java.lang.String, io.apicurio.datamodels.core.models.Node)
-     */
     @SuppressWarnings("rawtypes")
     @Override
     public Node resolveRef(String $ref, Node from) {
diff --git a/src/main/java/io/apicurio/datamodels/refs/Reference.java b/src/main/java/io/apicurio/datamodels/refs/Reference.java
index 5317f5f3c..a3e339570 100755
--- a/src/main/java/io/apicurio/datamodels/refs/Reference.java
+++ b/src/main/java/io/apicurio/datamodels/refs/Reference.java
@@ -5,8 +5,6 @@
 /**
  * Encapsulates a reference string in OpenAPI/AsyncAPI schema,
  * for easier manipulation and parsing.
- *
- * @author Jakub Senko <jsenko@redhat.com>
  */
 public class Reference {
 
diff --git a/src/main/java/io/apicurio/datamodels/validation/DefaultSeverityRegistry.java b/src/main/java/io/apicurio/datamodels/validation/DefaultSeverityRegistry.java
index fd65eed34..b26a49555 100755
--- a/src/main/java/io/apicurio/datamodels/validation/DefaultSeverityRegistry.java
+++ b/src/main/java/io/apicurio/datamodels/validation/DefaultSeverityRegistry.java
@@ -24,9 +24,6 @@
  */
 public class DefaultSeverityRegistry implements IValidationSeverityRegistry {
 
-    /**
-     * @see io.apicurio.datamodels.core.validation.IValidationSeverityRegistry#lookupSeverity(io.apicurio.datamodels.core.validation.ValidationRuleMetaData)
-     */
     @Override
     public ValidationProblemSeverity lookupSeverity(ValidationRuleMetaData rule) {
         if (rule.specMandated) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/ValidationRule.java b/src/main/java/io/apicurio/datamodels/validation/ValidationRule.java
index 9e0fe5d2f..b75f9d0c9 100755
--- a/src/main/java/io/apicurio/datamodels/validation/ValidationRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/ValidationRule.java
@@ -207,7 +207,6 @@ protected String getDefinitionName(Node node) {
      * Returns the name of an encoding.  This can only be determined using the traversal
      * context because the encoding name is the key for this encoding in the Map of
      * encodings for a media type.
-     * @param pathItem
      */
     protected String getEncodingName(OpenApiEncoding encoding) {
         return getMappedNodeName(encoding);
@@ -227,7 +226,6 @@ protected String getPathTemplate(OpenApiPathItem pathItem) {
 
     /**
      * Returns the status code of the given response.
-     * @param pathItem
      */
     protected String getStatusCode(OpenApiResponse response) {
         if (isDefinition(response)) {
@@ -239,7 +237,6 @@ protected String getStatusCode(OpenApiResponse response) {
 
     /**
      * Returns the operation method (get, put, post, etc) for the given operation.
-     * @param pathItem
      */
     protected String getOperationMethod(Operation operation) {
         return (String) this.traversalContext.getMostRecentStep().getValue();
diff --git a/src/main/java/io/apicurio/datamodels/validation/ValidationRuleSet.java b/src/main/java/io/apicurio/datamodels/validation/ValidationRuleSet.java
index 3f0a1ed0f..6e10fa9bb 100755
--- a/src/main/java/io/apicurio/datamodels/validation/ValidationRuleSet.java
+++ b/src/main/java/io/apicurio/datamodels/validation/ValidationRuleSet.java
@@ -448,7 +448,6 @@ public List<ValidationRuleMetaData> getAllRules() {
 
     /**
      * Gets the actual rule instances (visitors) that should be applied to the given document.
-     * @param document
      */
     public List<ValidationRule> getRulesFor(ModelType type) {
         List<ValidationRule> rval = new ArrayList<>();
diff --git a/src/main/java/io/apicurio/datamodels/validation/ValidationVisitor.java b/src/main/java/io/apicurio/datamodels/validation/ValidationVisitor.java
index ac9df56f5..9c7d1c284 100755
--- a/src/main/java/io/apicurio/datamodels/validation/ValidationVisitor.java
+++ b/src/main/java/io/apicurio/datamodels/validation/ValidationVisitor.java
@@ -74,9 +74,6 @@ public List<ValidationProblem> getValidationProblems() {
         return this.problems;
     }
 
-    /**
-     * @see io.apicurio.datamodels.core.validation.IValidationProblemReporter#report(io.apicurio.datamodels.core.validation.ValidationRuleMetaData, io.apicurio.datamodels.core.models.Node, java.lang.String, java.lang.String)
-     */
     @Override
     public void report(ValidationRuleMetaData ruleInfo, Node node, String property, String message) {
         ValidationProblemSeverity severity = this.severityRegistry.lookupSeverity(ruleInfo);
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidExternalDocsUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidExternalDocsUrlRule.java
index dbdaa92b9..86f67417d 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidExternalDocsUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidExternalDocsUrlRule.java
@@ -34,9 +34,6 @@ public OasInvalidExternalDocsUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
     
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitExternalDocumentation(io.apicurio.datamodels.core.models.common.ExternalDocumentation)
-     */
     @Override
     public void visitExternalDocumentation(ExternalDocumentation node) {
         if (hasValue(node.getUrl())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOpenIDConnectUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOpenIDConnectUrlRule.java
index 897751fda..042490617 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOpenIDConnectUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOpenIDConnectUrlRule.java
@@ -38,9 +38,6 @@ public OasInvalidOpenIDConnectUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         if (node.root().modelType() == ModelType.OPENAPI30) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationDescriptionRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationDescriptionRule.java
index 4266959cf..03a053901 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationDescriptionRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationDescriptionRule.java
@@ -34,9 +34,6 @@ public OasInvalidOperationDescriptionRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitOperation(io.apicurio.datamodels.core.models.common.Operation)
-     */
     @Override
     public void visitOperation(Operation node) {
         if (hasValue(node.getDescription())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationProducesRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationProducesRule.java
index 4264e9a2a..befedcb3f 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationProducesRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidOperationProducesRule.java
@@ -35,9 +35,6 @@ public OasInvalidOperationProducesRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitOperation(io.apicurio.datamodels.core.models.common.Operation)
-     */
     @Override
     public void visitOperation(Operation node) {
         OpenApi20Operation op = (OpenApi20Operation) node;
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidParameterDescriptionRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidParameterDescriptionRule.java
index 0c3ae1e22..d1e85fc40 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidParameterDescriptionRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidParameterDescriptionRule.java
@@ -34,9 +34,6 @@ public OasInvalidParameterDescriptionRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitParameter(io.apicurio.datamodels.core.models.common.Parameter)
-     */
     @Override
     public void visitParameter(Parameter node) {
         if (hasValue(node.getDescription())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidPathItemDescriptionRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidPathItemDescriptionRule.java
index fbdf5d8f2..9c0c1a60e 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidPathItemDescriptionRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidPathItemDescriptionRule.java
@@ -37,9 +37,6 @@ public OasInvalidPathItemDescriptionRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitPathItem(io.apicurio.datamodels.openapi.models.OasPathItem)
-     */
     @Override
     public void visitPathItem(OpenApiPathItem node) {
         String description = null;
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSchemaItemsDefaultValueRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSchemaItemsDefaultValueRule.java
index d0dad7c21..c23ec4d90 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSchemaItemsDefaultValueRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSchemaItemsDefaultValueRule.java
@@ -34,9 +34,6 @@ public OasInvalidSchemaItemsDefaultValueRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitItems(io.apicurio.datamodels.openapi.v2.models.OpenApi20Items)
-     */
     @Override
     public void visitItems(OpenApi20Items node) {
         if (hasValue(node.getDefault())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeAuthUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeAuthUrlRule.java
index c6eb00ba5..15025972d 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeAuthUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeAuthUrlRule.java
@@ -35,9 +35,6 @@ public OasInvalidSecuritySchemeAuthUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         OpenApi20SecurityScheme scheme = (OpenApi20SecurityScheme) node;
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeTokenUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeTokenUrlRule.java
index b014406d5..1455383ed 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeTokenUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidSecuritySchemeTokenUrlRule.java
@@ -35,9 +35,6 @@ public OasInvalidSecuritySchemeTokenUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         OpenApi20SecurityScheme scheme = (OpenApi20SecurityScheme) node;
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidServerVariableDescriptionRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidServerVariableDescriptionRule.java
index f784ecb82..f2cdce595 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidServerVariableDescriptionRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidServerVariableDescriptionRule.java
@@ -34,9 +34,6 @@ public OasInvalidServerVariableDescriptionRule(ValidationRuleMetaData ruleInfo)
         super(ruleInfo);
     }
     
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitServerVariable(io.apicurio.datamodels.core.models.common.ServerVariable)
-     */
     @Override
     public void visitServerVariable(ServerVariable node) {
         if (hasValue(node.getDescription())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidXmlNamespaceUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidXmlNamespaceUrlRule.java
index 54c5199fa..0e1e9140f 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidXmlNamespaceUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/format/OasInvalidXmlNamespaceUrlRule.java
@@ -34,9 +34,6 @@ public OasInvalidXmlNamespaceUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitXML(io.apicurio.datamodels.openapi.models.OasXML)
-     */
     @Override
     public void visitXML(OpenApiXML node) {
         if (hasValue(node.getNamespace())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/reference/OasInvalidSecuritySchemeReferenceRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/reference/OasInvalidSecuritySchemeReferenceRule.java
index caa3ab4ce..3ccfa0f2c 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/reference/OasInvalidSecuritySchemeReferenceRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/reference/OasInvalidSecuritySchemeReferenceRule.java
@@ -37,9 +37,6 @@ public OasInvalidSecuritySchemeReferenceRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         if (node.root().modelType() == ModelType.OPENAPI30 || node.root().modelType() == ModelType.OPENAPI31) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaArrayItemsRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaArrayItemsRule.java
index 3eb54f1eb..a020c4e9d 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaArrayItemsRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaArrayItemsRule.java
@@ -36,9 +36,6 @@ public OasInvalidSchemaArrayItemsRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSchema(io.apicurio.datamodels.core.models.common.Schema)
-     */
     @Override
     public void visitSchema(Schema node) {
         Schema items = (Schema) NodeUtil.getNodeProperty(node, "items");
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaTypeValueRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaTypeValueRule.java
index 358b9b1af..3e66eaaf4 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaTypeValueRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/type/OasInvalidSchemaTypeValueRule.java
@@ -34,9 +34,6 @@ public OasInvalidSchemaTypeValueRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSchema(io.apicurio.datamodels.core.models.common.Schema)
-     */
     @Override
     public void visitSchema(Schema node) {
         getTypes(node, (types, allowedTypes) ->
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasInvalidSecurityReqScopesRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasInvalidSecurityReqScopesRule.java
index ff7fffc7a..241d16d6f 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasInvalidSecurityReqScopesRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasInvalidSecurityReqScopesRule.java
@@ -35,9 +35,6 @@ public OasInvalidSecurityReqScopesRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityRequirement(io.apicurio.datamodels.core.models.common.SecurityRequirement)
-     */
     @Override
     public void visitSecurityRequirement(SecurityRequirement node) {
         List<String> snames = node.getItemNames();
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasSecurityRequirementScopesMustBeEmptyRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasSecurityRequirementScopesMustBeEmptyRule.java
index 1c41473c6..0b144bb96 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasSecurityRequirementScopesMustBeEmptyRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasSecurityRequirementScopesMustBeEmptyRule.java
@@ -57,9 +57,6 @@ private SecurityScheme findSecurityScheme(OpenApiDocument document, String schem
         return null;
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityRequirement(io.apicurio.datamodels.core.models.common.SecurityRequirement)
-     */
     @Override
     public void visitSecurityRequirement(SecurityRequirement node) {
         List<String> allowedTypes = new ArrayList<>();
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasServerVarNotFoundInTemplateRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasServerVarNotFoundInTemplateRule.java
index f6f366539..c05a8331c 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasServerVarNotFoundInTemplateRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasServerVarNotFoundInTemplateRule.java
@@ -65,9 +65,6 @@ private List<String> parseServerTemplate(String serverTemplate) {
         return vars;
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitServerVariable(io.apicurio.datamodels.core.models.common.ServerVariable)
-     */
     @Override
     public void visitServerVariable(ServerVariable node) {
         String varName = getMappedNodeName(node);
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasUnexpectedArrayCollectionFormatRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasUnexpectedArrayCollectionFormatRule.java
index 3c8b48b56..386fe2241 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasUnexpectedArrayCollectionFormatRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/invalid/value/OasUnexpectedArrayCollectionFormatRule.java
@@ -33,9 +33,6 @@ public OasUnexpectedArrayCollectionFormatRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitItems(io.apicurio.datamodels.openapi.v2.models.OpenApi20Items)
-     */
     @Override
     public void visitItems(OpenApi20Items node) {
         if (hasValue(node.getCollectionFormat())) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingLicenseNameRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingLicenseNameRule.java
index 4f17da6ed..f3d1cadc2 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingLicenseNameRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingLicenseNameRule.java
@@ -32,9 +32,6 @@ public MissingLicenseNameRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitLicense(io.apicurio.datamodels.core.models.common.License)
-     */
     @Override
     public void visitLicense(License node) {
         this.requireProperty(node, "name", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOpenIdConnectSecuritySchemeConnectUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOpenIdConnectSecuritySchemeConnectUrlRule.java
index 097a76046..356554517 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOpenIdConnectSecuritySchemeConnectUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOpenIdConnectSecuritySchemeConnectUrlRule.java
@@ -32,9 +32,6 @@ public MissingOpenIdConnectSecuritySchemeConnectUrlRule(ValidationRuleMetaData r
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         this.requirePropertyWhen(node, "openIdConnectUrl", "type", "openIdConnect", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOperationDescriptionRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOperationDescriptionRule.java
index 554065778..1ac1a9fb5 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOperationDescriptionRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingOperationDescriptionRule.java
@@ -32,9 +32,6 @@ public MissingOperationDescriptionRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitOperation(io.apicurio.datamodels.core.models.common.Operation)
-     */
     @Override
     public void visitOperation(Operation node) {
         this.requireProperty(node, "description", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingSecuritySchemeTypeRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingSecuritySchemeTypeRule.java
index 1d51bae95..1dc57633a 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingSecuritySchemeTypeRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingSecuritySchemeTypeRule.java
@@ -33,9 +33,6 @@ public MissingSecuritySchemeTypeRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSecurityScheme(io.apicurio.datamodels.core.models.common.SecurityScheme)
-     */
     @Override
     public void visitSecurityScheme(SecurityScheme node) {
         if (hasValue(NodeUtil.getProperty(node, "$ref"))) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingServerTemplateUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingServerTemplateUrlRule.java
index 72b12b393..53067ebd3 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingServerTemplateUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/MissingServerTemplateUrlRule.java
@@ -33,9 +33,6 @@ public MissingServerTemplateUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitServer(io.apicurio.datamodels.core.models.common.Server)
-     */
     @Override
     public void visitServer(Server node) {
         this.requireProperty(node, "url", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingApiInformationRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingApiInformationRule.java
index ce3ff483d..2d30bc150 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingApiInformationRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingApiInformationRule.java
@@ -32,9 +32,6 @@ public OasMissingApiInformationRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitDocument(io.apicurio.datamodels.core.models.Document)
-     */
     @Override
     public void visitDocument(Document node) {
         this.requireProperty(node, "info", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingExternalDocumentationUrlRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingExternalDocumentationUrlRule.java
index bd591ded9..b87305b63 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingExternalDocumentationUrlRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingExternalDocumentationUrlRule.java
@@ -32,9 +32,6 @@ public OasMissingExternalDocumentationUrlRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitExternalDocumentation(io.apicurio.datamodels.core.models.common.ExternalDocumentation)
-     */
     @Override
     public void visitExternalDocumentation(ExternalDocumentation node) {
         this.requireProperty(node, "url", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingOpenApiPropertyRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingOpenApiPropertyRule.java
index f6bd380a6..18fb9a8c1 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingOpenApiPropertyRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingOpenApiPropertyRule.java
@@ -34,9 +34,6 @@ public OasMissingOpenApiPropertyRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitDocument(io.apicurio.datamodels.core.models.Document)
-     */
     @Override
     public void visitDocument(Document node) {
         ModelType mt = node.root().modelType();
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingParameterTypeRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingParameterTypeRule.java
index 7e016fb5a..6142cdd73 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingParameterTypeRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingParameterTypeRule.java
@@ -34,9 +34,6 @@ public OasMissingParameterTypeRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitParameter(io.apicurio.datamodels.core.models.common.Parameter)
-     */
     @Override
     public void visitParameter(Parameter node) {
         if (hasValue(NodeUtil.getNodeProperty(node, "$ref"))) {
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingSchemaArrayInformationRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingSchemaArrayInformationRule.java
index e03909ac3..7f5a80419 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingSchemaArrayInformationRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingSchemaArrayInformationRule.java
@@ -32,9 +32,6 @@ public OasMissingSchemaArrayInformationRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitSchema(io.apicurio.datamodels.core.models.common.Schema)
-     */
     @Override
     public void visitSchema(Schema node) {
         this.requirePropertyWhen(node, "items", "type", "array", map());
diff --git a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingServerVarDefaultValueRule.java b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingServerVarDefaultValueRule.java
index f6438f5fd..bc3834b4d 100755
--- a/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingServerVarDefaultValueRule.java
+++ b/src/main/java/io/apicurio/datamodels/validation/rules/required/OasMissingServerVarDefaultValueRule.java
@@ -32,9 +32,6 @@ public OasMissingServerVarDefaultValueRule(ValidationRuleMetaData ruleInfo) {
         super(ruleInfo);
     }
 
-    /**
-     * @see io.apicurio.datamodels.combined.visitors.CombinedAllNodeVisitor#visitServerVariable(io.apicurio.datamodels.core.models.common.ServerVariable)
-     */
     @Override
     public void visitServerVariable(ServerVariable node) {
         String variableName = getMappedNodeName(node);
diff --git a/src/main/java/io/apicurio/datamodels/visitors/CompositeAllNodeVisitor.java b/src/main/java/io/apicurio/datamodels/visitors/CompositeAllNodeVisitor.java
index e1a5e62c6..f7f085b42 100755
--- a/src/main/java/io/apicurio/datamodels/visitors/CompositeAllNodeVisitor.java
+++ b/src/main/java/io/apicurio/datamodels/visitors/CompositeAllNodeVisitor.java
@@ -28,7 +28,7 @@
  * A composite visitor base class useful for any data model type.
  *
  * @author eric.wittmann@gmail.com
- * @author Jakub Senko <jsenko@redhat.com>
+ * @author jsenko@redhat.com
  */
 public class CompositeAllNodeVisitor extends AllNodeVisitor {
 
diff --git a/src/main/java/io/apicurio/datamodels/visitors/ConsumesProducesFinder.java b/src/main/java/io/apicurio/datamodels/visitors/ConsumesProducesFinder.java
index dafb596d8..fe3b735aa 100755
--- a/src/main/java/io/apicurio/datamodels/visitors/ConsumesProducesFinder.java
+++ b/src/main/java/io/apicurio/datamodels/visitors/ConsumesProducesFinder.java
@@ -34,9 +34,6 @@ public class ConsumesProducesFinder extends OpenApi20VisitorAdapter {
     public List<String> consumes;
     public List<String> produces;
 
-    /**
-     * @see io.apicurio.datamodels.core.visitors.VisitorAdapter#visitDocument(io.apicurio.datamodels.core.models.Document)
-     */
     @Override
     public void visitDocument(Document node) {
         OpenApi20Document doc = (OpenApi20Document) node;
@@ -48,9 +45,6 @@ public void visitDocument(Document node) {
         }
     }
 
-    /**
-     * @see io.apicurio.datamodels.core.visitors.VisitorAdapter#visitOperation(io.apicurio.datamodels.core.models.common.Operation)
-     */
     @Override
     public void visitOperation(Operation node) {
         consumes = ((OpenApi20Operation) node).getConsumes();