diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
index e25cd67e10..6c95e97ef6 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTArguments.java
@@ -4,12 +4,8 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTArguments extends AbstractVfNode {
 
-    @Deprecated
-    @InternalApi
     ASTArguments(int id) {
         super(id);
     }
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java
index 9a5ab715e2..296a6f189c 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTAttribute.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTAttribute extends AbstractVfNode {
 
     private String name;
@@ -19,9 +17,7 @@ public final class ASTAttribute extends AbstractVfNode {
         return name;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setName(String name) {
+    void setName(String name) {
         this.name = name;
     }
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java
index ad2ea9096b..c58fe458da 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDeclaration.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTDeclaration extends AbstractVfNode {
 
     private String name;
@@ -18,9 +16,7 @@ public final class ASTDeclaration extends AbstractVfNode {
         return name;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setName(String name) {
+    void setName(String name) {
         this.name = name;
     }
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java
index 230a625ae1..6ddb097ac8 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeDeclaration.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTDoctypeDeclaration extends AbstractVfNode {
 
     /**
@@ -21,9 +19,7 @@ public final class ASTDoctypeDeclaration extends AbstractVfNode {
         return name;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setName(String name) {
+    void setName(String name) {
         this.name = name;
     }
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java
index 566e2f6c8c..6a969700dd 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTDoctypeExternalId.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTDoctypeExternalId extends AbstractVfNode {
 
     /**
@@ -30,9 +28,7 @@ public final class ASTDoctypeExternalId extends AbstractVfNode {
         return uri;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setUri(String uri) {
+    void setUri(String uri) {
         this.uri = uri;
     }
 
@@ -44,9 +40,7 @@ public final class ASTDoctypeExternalId extends AbstractVfNode {
         return null == publicId ? "" : publicId;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setPublicId(String publicId) {
+    void setPublicId(String publicId) {
         this.publicId = publicId;
     }
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java
index 6fde1d532b..ecdbcc4dcb 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/ASTElement.java
@@ -4,8 +4,6 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.annotation.InternalApi;
-
 public final class ASTElement extends AbstractVfNode {
 
     /**
@@ -59,9 +57,7 @@ public final class ASTElement extends AbstractVfNode {
         return name;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setName(String name) {
+    void setName(String name) {
         this.name = name;
     }
 
@@ -73,15 +69,11 @@ public final class ASTElement extends AbstractVfNode {
         return unclosed;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setUnclosed(boolean unclosed) {
+    void setUnclosed(boolean unclosed) {
         this.unclosed = unclosed;
     }
 
-    @Deprecated
-    @InternalApi
-    public void setEmpty(boolean empty) {
+    void setEmpty(boolean empty) {
         this.empty = empty;
     }
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
index af06de28d5..910c21db2a 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/OpenTagRegister.java
@@ -20,9 +20,8 @@ import net.sourceforge.pmd.util.StringUtil;
  * @author Victor Bucutea
  *
  */
-@Deprecated
 @InternalApi
-public class OpenTagRegister {
+class OpenTagRegister {
 
     private List<ASTElement> tagList = new ArrayList<>();
 
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java
index 1fb82c15ea..9cce89b6d6 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/VfTokenManager.java
@@ -2,25 +2,17 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-
 package net.sourceforge.pmd.lang.vf.ast;
 
 import java.io.Reader;
 
 import net.sourceforge.pmd.annotation.InternalApi;
-import net.sourceforge.pmd.lang.LanguageVersionHandler;
-import net.sourceforge.pmd.lang.Parser;
-import net.sourceforge.pmd.lang.ParserOptions;
 import net.sourceforge.pmd.lang.TokenManager;
 import net.sourceforge.pmd.lang.ast.impl.javacc.CharStreamFactory;
 
 /**
  * VF Token Manager implementation.
- *
- * @deprecated This is internal API, use {@link Parser#getTokenManager(String, Reader)} via
- *             {@link LanguageVersionHandler#getParser(ParserOptions)}.
  */
-@Deprecated
 @InternalApi
 public class VfTokenManager implements TokenManager {
     private final VfParserImplTokenManager tokenManager;