--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java	Wed Oct 16 21:05:24 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java	Thu Oct 17 18:30:57 2019 +0000
@@ -282,26 +282,6 @@
 
     }
 
-    public Content accessorTagOutput(Element holder, List<? extends DocTree> tags) {
-        if (!tags.isEmpty()) {
-            //Todo: check that there's only one tag
-            DocTree.Kind kind = tags.get(0).getKind();
-            ExecutableElement accessor = utils.findAccessorFor((VariableElement)holder, kind);
-            //add reference to getter/setter
-            Content body = htmlWriter.getDocLink(LinkInfoImpl.Kind.SEE_TAG, (TypeElement)holder.getEnclosingElement(),
-                    accessor, accessor.getSimpleName() + utils.makeSignature(accessor, true), false, false);
-            ContentBuilder result = new ContentBuilder();
-            String key = kind == Kind.GETTER ?
-                    "doclet.getter" : "doclet.setter";
-            result.add(HtmlTree.DT(HtmlTree.SPAN(HtmlStyle.seeLabel,
-                    new StringContent(resources.getText(key)))));
-            result.add(HtmlTree.DD(body));
-            return result;
-        } else {
-            return new ContentBuilder();
-        }
-    }
-
     private void appendSeparatorIfNotEmpty(ContentBuilder body) {
         if (!body.isEmpty()) {
             body.add(", ");

--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties	Wed Oct 16 21:05:24 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties	Thu Oct 17 18:30:57 2019 +0000
@@ -104,8 +104,6 @@
 doclet.Return_tag_on_void_method=@return tag cannot be used in method with void return type.
 doclet.See_Also=See Also:
 doclet.See=See:
-doclet.getter=Getter:
-doclet.setter=Setter:
 doclet.SerialData=Serial Data:
 doclet.Services=Services
 doclet.Since=Since:

--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/AccessorTaglet.java	Wed Oct 16 21:05:24 2019 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.javadoc.internal.doclets.toolkit.taglets;
-
-import java.util.EnumSet;
-
-import com.sun.source.doctree.DocTree;
-import jdk.javadoc.internal.doclets.toolkit.Content;
-import jdk.javadoc.internal.doclets.toolkit.util.Utils;
-
-import javax.lang.model.element.Element;
-import javax.lang.model.element.VariableElement;
-import java.util.List;
-
-/**
- * A taglet that represents the @param tag.
- *
- *  <p><b>This is NOT part of any supported API.
- *  If you write code that depends on this, you do so at your own risk.
- *  This code and its internal interfaces are subject to change or
- *  deletion without notice.</b>
- *
- * @author Jamie Ho
- */
-public class AccessorTaglet extends BaseTaglet {
-
-    DocTree.Kind kind;
-
-    /**
-     * Construct a ParamTaglet.
-     */
-    public AccessorTaglet(DocTree.Kind kind) {
-        super(kind.tagName, false, EnumSet.of(Site.FIELD));
-        this.kind = kind;
-    }
-
-   /**
-     * Given an array of <code>ParamTag</code>s,return its string representation.
-     * @param holder the member that holds the param tags.
-     * @param writer the TagletWriter that will write this tag.
-     * @return the TagletOutput representation of these <code>ParamTag</code>s.
-     */
-    public Content getTagletOutput(Element holder, TagletWriter writer) {
-        Utils utils = writer.configuration().utils;
-        return writer.accessorTagOutput(holder, utils.getBlockTags(holder, kind));
-    }
-}
-

--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java	Wed Oct 16 21:05:24 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java	Thu Oct 17 18:30:57 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -643,8 +643,6 @@
         addStandardTaglet(new CodeTaglet());
         addStandardTaglet(new IndexTaglet());
         addStandardTaglet(new SummaryTaglet());
-        addStandardTaglet(new AccessorTaglet(GETTER));
-        addStandardTaglet(new AccessorTaglet(SETTER));
         addStandardTaglet(new SystemPropertyTaglet());
 
         // Keep track of the names of standard tags for error checking purposes.

--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java	Wed Oct 16 21:05:24 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletWriter.java	Thu Oct 17 18:30:57 2019 +0000
@@ -154,15 +154,6 @@
     protected abstract Content seeTagOutput(Element holder, List<? extends DocTree> seeTags);
 
     /**
-     * Return the accessor tag output.
-     *
-     * @param holder
-     * @param tags the accessor tags
-     * @return the output of the accessor tag.
-     */
-    protected abstract Content accessorTagOutput(Element holder, List<? extends DocTree> tags);
-
-    /**
      * Return the output for a simple tag.
      *
      * @param element

--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Wed Oct 16 21:05:24 2019 -0400
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java	Thu Oct 17 18:30:57 2019 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -214,15 +214,6 @@
         return null;
     }
 
-    public ExecutableElement findAccessorFor(VariableElement field, DocTree.Kind kind) {
-        switch (kind) {
-            case GETTER:
-                return elementUtils.getterFor(field);
-            default:
-                throw new IllegalStateException("Cannot get here!");
-        }
-    }
-
     /**
      * Test whether a class is a subclass of another class.
      *

--- a/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out	Wed Oct 16 21:05:24 2019 -0400
+++ b/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out	Thu Oct 17 18:30:57 2019 +0000
@@ -5,7 +5,6 @@
           {@docRoot}: overview module package type constructor method field inline ........
           @exception: ........ ...... ....... .... constructor method ..... ...... ........
             @factory: ........ ...... ....... .... ........... method ..... ...... ........
-             @getter: ........ ...... ....... .... ........... ...... field ...... ........
              @hidden: ........ ...... ....... type ........... method field ...... ........
             {@index}: overview module package type constructor method field inline ........
        {@inheritDoc}: ........ ...... ....... type ........... method ..... inline ........
@@ -22,7 +21,6 @@
              @serial: ........ ...... package type ........... ...... field ...... ........
          @serialData: ........ ...... ....... .... ........... ...... ..... ...... ........
         @serialField: ........ ...... ....... .... ........... ...... field ...... ........
-             @setter: ........ ...... ....... .... ........... ...... field ...... ........
               @since: overview module package type constructor method field ...... ........
           {@summary}: overview module package type constructor method field inline ........
    {@systemProperty}: ........ module package type constructor method field inline ........