diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index 2c906a08b0..99603a5ab8 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -195,6 +195,16 @@ The following previously deprecated classes have been removed:
   * `net.sourceforge.pmd.lang.jsp.ast.JspParserVisitorAdapter`
   * {%jdoc !!jsp::lang.jsp.ast.JspNode %} - method `jjtAccept()` has been removed.
     Use {%jdoc core::lang.ast.Node#acceptVisitor(core::lang.ast.AstVisitor,P) %} instead.
+* pmd-modelica
+  * `net.sourceforge.pmd.lang.modelica.ast.ModelicaParserVisitor`
+    Use {%jdoc modelica::net.sourceforge.pmd.lang.modelica.ast.ModelicaVisitor %} instead.
+  * `net.sourceforge.pmd.lang.modelica.ast.ModelicaParserVisitorAdapter`
+  * {%jdoc !!modelica::lang.modelica.ast.ModelicaNode %} - method `jjtAccept()` has been removed.
+    Use {%jdoc core::lang.ast.Node#acceptVisitor(core::lang.ast.AstVisitor,P) %} instead.
+  * `net.sourceforge.pmd.lang.modelica.rule.AmbiguousResolutionRule`
+    Use {%jdoc modelica::lang.modelica.rule.bestpractices.AmbiguousResolutionRule %} instead.
+  * `net.sourceforge.pmd.lang.modelica.rule.ConnectUsingNonConnector`
+    Use {%jdoc modelica::lang.modelica.rule.bestpractices.ConnectUsingNonConnectorRule %}
 
 **Removed classes, interfaces and methods (not previously deprecated)**
 
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaNode.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaNode.java
index fd6e5306bf..0acfd1636e 100644
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaNode.java
+++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaNode.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.modelica.ast;
 
-import net.sourceforge.pmd.annotation.DeprecatedUntil700;
-import net.sourceforge.pmd.lang.ast.AstVisitor;
 import net.sourceforge.pmd.lang.ast.impl.javacc.JjtreeNode;
 import net.sourceforge.pmd.lang.modelica.resolver.ModelicaScope;
 
@@ -14,17 +12,6 @@ import net.sourceforge.pmd.lang.modelica.resolver.ModelicaScope;
  */
 public interface ModelicaNode extends JjtreeNode<ModelicaNode> {
 
-
-    /**
-     * @deprecated Use {@link #acceptVisitor(AstVisitor, Object)}
-     */
-    @DeprecatedUntil700
-    @Deprecated
-    default Object jjtAccept(ModelicaParserVisitor visitor, Object data) {
-        return acceptVisitor(visitor, data);
-    }
-
-
     /**
      * Returns the lexical scope this node is contained in.
      */
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitor.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitor.java
deleted file mode 100644
index 628084c1b0..0000000000
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.modelica.ast;
-
-import net.sourceforge.pmd.annotation.DeprecatedUntil700;
-import net.sourceforge.pmd.lang.ast.Node;
-
-/**
- * Backwards-compatibility only.
- *
- * @deprecated Use {@link ModelicaVisitor}
- */
-@Deprecated
-@DeprecatedUntil700
-public interface ModelicaParserVisitor extends ModelicaVisitor<Object, Object> {
-
-    @Override
-    default Object visitNode(Node node, Object param) {
-        node.children().forEach(c -> c.acceptVisitor(this, param));
-        return param;
-    }
-
-}
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitorAdapter.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitorAdapter.java
deleted file mode 100644
index cc60cb6226..0000000000
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ModelicaParserVisitorAdapter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.lang.modelica.ast;
-
-import net.sourceforge.pmd.annotation.DeprecatedUntil700;
-
-
-@Deprecated
-@DeprecatedUntil700
-public class ModelicaParserVisitorAdapter extends ModelicaVisitorBase<Object, Object> implements ModelicaParserVisitor {
-}
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/AmbiguousResolutionRule.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/AmbiguousResolutionRule.java
deleted file mode 100644
index 169946a4c6..0000000000
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/AmbiguousResolutionRule.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-
-package net.sourceforge.pmd.lang.modelica.rule;
-
-/**
- * @deprecated Use {@link net.sourceforge.pmd.lang.modelica.rule.bestpractices.AmbiguousResolutionRule}
- */
-@Deprecated
-public class AmbiguousResolutionRule extends net.sourceforge.pmd.lang.modelica.rule.bestpractices.AmbiguousResolutionRule {
-
-}
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/ConnectUsingNonConnector.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/ConnectUsingNonConnector.java
deleted file mode 100644
index 8698df8b36..0000000000
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/rule/ConnectUsingNonConnector.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-
-package net.sourceforge.pmd.lang.modelica.rule;
-
-import net.sourceforge.pmd.lang.modelica.rule.bestpractices.ConnectUsingNonConnectorRule;
-
-/**
- * @deprecated Use {@link ConnectUsingNonConnectorRule}
- */
-@Deprecated
-public class ConnectUsingNonConnector extends ConnectUsingNonConnectorRule {
-
-}