diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 44178ff2a3..2daa0a7f23 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -291,7 +291,6 @@ class WP_Object_Cache {
 	 * Holds the cached objects.
 	 *
 	 * @since 2.0.0
-	 * @access private
 	 * @var array
 	 */
 	private $cache = array();
@@ -300,7 +299,6 @@ class WP_Object_Cache {
 	 * The amount of times the cache data was already stored in the cache.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $cache_hits = 0;
@@ -309,7 +307,6 @@ class WP_Object_Cache {
 	 * Amount of times the cache did not have the request in cache.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var int
 	 */
 	public $cache_misses = 0;
@@ -318,7 +315,6 @@ class WP_Object_Cache {
 	 * List of global cache groups.
 	 *
 	 * @since 3.0.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $global_groups = array();
@@ -327,7 +323,6 @@ class WP_Object_Cache {
 	 * The blog prefix to prepend to keys in non-global groups.
 	 *
 	 * @since 3.5.0
-	 * @access private
 	 * @var int
 	 */
 	private $blog_prefix;
@@ -336,7 +331,6 @@ class WP_Object_Cache {
 	 * Holds the value of is_multisite().
 	 *
 	 * @since 3.5.0
-	 * @access private
 	 * @var bool
 	 */
 	private $multisite;
@@ -345,7 +339,6 @@ class WP_Object_Cache {
 	 * Makes private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -358,7 +351,6 @@ class WP_Object_Cache {
 	 * Makes private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name  Property to set.
 	 * @param mixed  $value Property value.
@@ -372,7 +364,6 @@ class WP_Object_Cache {
 	 * Makes private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -385,7 +376,6 @@ class WP_Object_Cache {
 	 * Makes private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to unset.
 	 */
@@ -397,7 +387,6 @@ class WP_Object_Cache {
 	 * Adds data to the cache if it doesn't already exist.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @uses WP_Object_Cache::_exists() Checks to see if the cache already has data.
 	 * @uses WP_Object_Cache::set()     Sets the data after the checking the cache
@@ -430,7 +419,6 @@ class WP_Object_Cache {
 	 * Sets the list of global cache groups.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param array $groups List of groups that are global.
 	 */
@@ -445,7 +433,6 @@ class WP_Object_Cache {
 	 * Decrements numeric cache item's value.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param int|string $key    The cache key to decrement.
 	 * @param int        $offset Optional. The amount by which to decrement the item's value. Default 1.
@@ -481,7 +468,6 @@ class WP_Object_Cache {
 	 * If the cache key does not exist in the group, then nothing will happen.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param int|string $key        What the contents in the cache are called.
 	 * @param string     $group      Optional. Where the cache contents are grouped. Default 'default'.
@@ -506,7 +492,6 @@ class WP_Object_Cache {
 	 * Clears the object cache of all data.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @return true Always returns true.
 	 */
@@ -526,7 +511,6 @@ class WP_Object_Cache {
 	 * On failure, the number of cache misses will be incremented.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param int|string $key    What the contents in the cache are called.
 	 * @param string     $group  Optional. Where the cache contents are grouped. Default 'default'.
@@ -561,7 +545,6 @@ class WP_Object_Cache {
 	 * Increments numeric cache item's value.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param int|string $key    The cache key to increment
 	 * @param int        $offset Optional. The amount by which to increment the item's value. Default 1.
@@ -595,7 +578,6 @@ class WP_Object_Cache {
 	 * Replaces the contents in the cache, if contents already exist.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @see WP_Object_Cache::set()
 	 *
@@ -623,7 +605,6 @@ class WP_Object_Cache {
 	 * Resets cache keys.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @deprecated 3.5.0 Use switch_to_blog()
 	 * @see switch_to_blog()
@@ -651,7 +632,6 @@ class WP_Object_Cache {
 	 * more for cache plugins which use files.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param int|string $key    What to call the contents in the cache.
 	 * @param mixed      $data   The contents to store in the cache.
@@ -680,7 +660,6 @@ class WP_Object_Cache {
 	 * key and the data.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 */
 	public function stats() {
 		echo "<p>";
@@ -700,7 +679,6 @@ class WP_Object_Cache {
 	 * This changes the blog ID used to create keys in blog specific groups.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
@@ -713,7 +691,6 @@ class WP_Object_Cache {
 	 * Serves as a utility function to determine whether a key exists in the cache.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 *
 	 * @param int|string $key   Cache key to check for existence.
 	 * @param string     $group Cache group for the key existence check.
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 786b06d647..31baadacb6 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -98,7 +98,6 @@ class WP_Http {
 	 * Please note: The only URI that are supported in the HTTP Transport implementation
 	 * are the HTTP and HTTPS protocols.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string       $url  The request URL.
@@ -428,7 +427,6 @@ class WP_Http {
 	 * Normalizes cookies for using in Requests.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @static
 	 *
 	 * @param array $cookies List of cookies to send with the request.
@@ -456,7 +454,6 @@ class WP_Http {
 	 * specification for compatibility purposes.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string            $location URL to redirect to.
@@ -489,7 +486,6 @@ class WP_Http {
 	 * Tests which transports are capable of supporting the request.
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 *
 	 * @param array $args Request arguments
 	 * @param string $url URL to Request
@@ -539,7 +535,6 @@ class WP_Http {
 	 * @since 3.2.0
 	 *
 	 * @static
-	 * @access private
 	 *
 	 * @param string $url URL to Request
 	 * @param array $args Request arguments
@@ -581,7 +576,6 @@ class WP_Http {
 	 *
 	 * Used for sending data that is expected to be in the body.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string       $url  The request URL.
@@ -599,7 +593,6 @@ class WP_Http {
 	 *
 	 * Used for sending data that is expected to be in the body.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string $url The request URL.
@@ -617,7 +610,6 @@ class WP_Http {
 	 *
 	 * Used for sending data that is expected to be in the body.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string $url The request URL.
@@ -633,7 +625,6 @@ class WP_Http {
 	/**
 	 * Parses the responses and splits the parts into headers and body.
 	 *
-	 * @access public
 	 * @static
 	 * @since 2.7.0
 	 *
@@ -652,7 +643,6 @@ class WP_Http {
 	 * If an array is given then it is assumed to be raw header data with numeric keys with the
 	 * headers as the values. No headers must be passed that were already processed.
 	 *
-	 * @access public
 	 * @static
 	 * @since 2.7.0
 	 *
@@ -730,7 +720,6 @@ class WP_Http {
 	 * which are each parsed into strings and added to the Cookie: header (within the arguments array).
 	 * Edits the array by reference.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 * @static
 	 *
@@ -761,7 +750,6 @@ class WP_Http {
 	 *
 	 * @link https://tools.ietf.org/html/rfc2616#section-19.4.6 Process for chunked decoding.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 * @static
 	 *
@@ -811,7 +799,6 @@ class WP_Http {
 	 * are supported, eg *.wordpress.org will allow for all subdomains of wordpress.org to be contacted.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @link https://core.trac.wordpress.org/ticket/8927 Allow preventing external requests.
 	 * @link https://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_ACCESSIBLE_HOSTS
 	 *
@@ -871,7 +858,6 @@ class WP_Http {
 	/**
 	 * Used as a wrapper for PHP's parse_url() function that handles edgecases in < PHP 5.4.7.
 	 *
-	 * @access protected
 	 * @deprecated 4.4.0 Use wp_parse_url()
 	 * @see wp_parse_url()
 	 *
@@ -892,7 +878,6 @@ class WP_Http {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param string $maybe_relative_path The URL which might be relative
 	 * @param string $url                 The URL which $maybe_relative_path is relative to
@@ -963,7 +948,6 @@ class WP_Http {
 	 * Handles HTTP Redirects and follows them if appropriate.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string $url The URL which was requested.
@@ -1020,7 +1004,6 @@ class WP_Http {
 	 * @link http://home.deds.nl/~aeron/regex/ for IPv6 regex
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string $maybe_ip A suspected IP address
diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index 5462bec63a..616a844186 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -22,7 +22,6 @@ class WP_oEmbed {
 	 * A list of oEmbed providers.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 * @var array
 	 */
 	public $providers = array();
@@ -31,7 +30,6 @@ class WP_oEmbed {
 	 * A list of an early oEmbed providers.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 * @var array
 	 */
@@ -41,7 +39,6 @@ class WP_oEmbed {
 	 * A list of private/protected methods, used for backward compatibility.
 	 *
 	 * @since 4.2.0
-	 * @access private
 	 * @var array
 	 */
 	private $compat_methods = array( '_fetch_with_format', '_parse_json', '_parse_xml', '_parse_xml_body' );
@@ -50,7 +47,6 @@ class WP_oEmbed {
 	 * Constructor.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 */
 	public function __construct() {
 		$host = urlencode( home_url() );
@@ -211,7 +207,6 @@ class WP_oEmbed {
 	 * Exposes private/protected methods for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
@@ -228,7 +223,6 @@ class WP_oEmbed {
 	 * Takes a URL and returns the corresponding oEmbed provider's URL, if there is one.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @see WP_oEmbed::discover()
 	 *
@@ -275,7 +269,6 @@ class WP_oEmbed {
 	 *
 	 * @static
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @see wp_oembed_add_provider()
 	 *
@@ -302,7 +295,6 @@ class WP_oEmbed {
 	 * The just-in-time removal is for the benefit of the {@see 'oembed_providers'} filter.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 *
 	 * @see wp_oembed_remove_provider()
@@ -324,7 +316,6 @@ class WP_oEmbed {
 	 * @see WP_oEmbed::fetch()
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param string       $url  The URL to the content that should be attempted to be embedded.
 	 * @param array|string $args Optional. Arguments, usually passed from a shortcode. Default empty.
@@ -355,7 +346,6 @@ class WP_oEmbed {
 	 * @see WP_oEmbed::data2html()
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 *
 	 * @param string       $url  The URL to the content that should be attempted to be embedded.
 	 * @param array|string $args Optional. Arguments, usually passed from a shortcode. Default empty.
@@ -405,7 +395,6 @@ class WP_oEmbed {
 	 * Attempts to discover link tags at the given URL for an oEmbed provider.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 *
 	 * @param string $url The URL that should be inspected for discovery `<link>` tags.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
@@ -489,7 +478,6 @@ class WP_oEmbed {
 	 * Connects to a oEmbed provider and returns the result.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 *
 	 * @param string       $provider The URL to the oEmbed provider.
 	 * @param string       $url      The URL to the content that is desired to be embedded.
@@ -527,7 +515,6 @@ class WP_oEmbed {
 	 * Fetches result from an oEmbed provider for a specific format and complete provider URL
 	 *
 	 * @since 3.0.0
-	 * @access private
 	 *
 	 * @param string $provider_url_with_args URL to the provider with full arguments list (url, maxheight, etc.)
 	 * @param string $format Format to use
@@ -552,7 +539,6 @@ class WP_oEmbed {
 	 * Parses a json response body.
 	 *
 	 * @since 3.0.0
-	 * @access private
 	 *
 	 * @param string $response_body
 	 * @return object|false
@@ -566,7 +552,6 @@ class WP_oEmbed {
 	 * Parses an XML response body.
 	 *
 	 * @since 3.0.0
-	 * @access private
 	 *
 	 * @param string $response_body
 	 * @return object|false
@@ -590,7 +575,6 @@ class WP_oEmbed {
 	 * Serves as a helper function for parsing an XML response body.
 	 *
 	 * @since 3.6.0
-	 * @access private
 	 *
 	 * @param string $response_body
 	 * @return stdClass|false
@@ -628,7 +612,6 @@ class WP_oEmbed {
 	 * Converts a data object from WP_oEmbed::fetch() and returns the HTML.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 *
 	 * @param object $data A data object result from an oEmbed provider.
 	 * @param string $url The URL to the content that is desired to be embedded.
@@ -685,7 +668,6 @@ class WP_oEmbed {
 	 *
 	 * @since 2.9.0 as strip_scribd_newlines()
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param string $html Existing HTML.
 	 * @param object $data Data object from WP_oEmbed::data2html()
diff --git a/wp-includes/class-walker-category-dropdown.php b/wp-includes/class-walker-category-dropdown.php
index 7d89dc8b97..cd167129d6 100644
--- a/wp-includes/class-walker-category-dropdown.php
+++ b/wp-includes/class-walker-category-dropdown.php
@@ -20,7 +20,6 @@ class Walker_CategoryDropdown extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -31,7 +30,6 @@ class Walker_CategoryDropdown extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @todo Decouple this
 	 * @var array
 	 *
@@ -43,7 +41,6 @@ class Walker_CategoryDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::start_el()
 	 *
diff --git a/wp-includes/class-walker-category.php b/wp-includes/class-walker-category.php
index 01b7264fa8..5281919e84 100644
--- a/wp-includes/class-walker-category.php
+++ b/wp-includes/class-walker-category.php
@@ -20,7 +20,6 @@ class Walker_Category extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -31,7 +30,6 @@ class Walker_Category extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var array
 	 *
 	 * @see Walker::$db_fields
@@ -43,7 +41,6 @@ class Walker_Category extends Walker {
 	 * Starts the list before the elements are added.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::start_lvl()
 	 *
@@ -64,7 +61,6 @@ class Walker_Category extends Walker {
 	 * Ends the list of after the elements are added.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::end_lvl()
 	 *
@@ -85,7 +81,6 @@ class Walker_Category extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::start_el()
 	 *
@@ -215,7 +210,6 @@ class Walker_Category extends Walker {
 	 * Ends the element output, if needed.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::end_el()
 	 *
diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php
index 8383740b43..d1b3d399ee 100644
--- a/wp-includes/class-walker-comment.php
+++ b/wp-includes/class-walker-comment.php
@@ -20,7 +20,6 @@ class Walker_Comment extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -31,7 +30,6 @@ class Walker_Comment extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 * @var array
 	 *
 	 * @see Walker::$db_fields
@@ -43,7 +41,6 @@ class Walker_Comment extends Walker {
 	 * Starts the list before the elements are added.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @see Walker::start_lvl()
 	 * @global int $comment_depth
@@ -72,7 +69,6 @@ class Walker_Comment extends Walker {
 	 * Ends the list of items after the elements are added.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @see Walker::end_lvl()
 	 * @global int $comment_depth
@@ -118,7 +114,6 @@ class Walker_Comment extends Walker {
 	 *      2.2
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @see Walker::display_element()
 	 * @see wp_list_comments()
@@ -157,7 +152,6 @@ class Walker_Comment extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @see Walker::start_el()
 	 * @see wp_list_comments()
@@ -201,7 +195,6 @@ class Walker_Comment extends Walker {
 	 * Ends the element output, if needed.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @see Walker::end_el()
 	 * @see wp_list_comments()
@@ -228,7 +221,6 @@ class Walker_Comment extends Walker {
 	 * Outputs a pingback comment.
 	 *
 	 * @since 3.6.0
-	 * @access protected
 	 *
 	 * @see wp_list_comments()
 	 *
@@ -250,7 +242,6 @@ class Walker_Comment extends Walker {
 	 * Outputs a single comment.
 	 *
 	 * @since 3.6.0
-	 * @access protected
 	 *
 	 * @see wp_list_comments()
 	 *
@@ -314,7 +305,6 @@ class Walker_Comment extends Walker {
 	 * Outputs a comment in the HTML5 format.
 	 *
 	 * @since 3.6.0
-	 * @access protected
 	 *
 	 * @see wp_list_comments()
 	 *
diff --git a/wp-includes/class-walker-nav-menu.php b/wp-includes/class-walker-nav-menu.php
index 83dbfed45c..da6f3599b7 100644
--- a/wp-includes/class-walker-nav-menu.php
+++ b/wp-includes/class-walker-nav-menu.php
@@ -19,7 +19,6 @@ class Walker_Nav_Menu extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -30,7 +29,6 @@ class Walker_Nav_Menu extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @todo Decouple this.
 	 * @var array
 	 *
diff --git a/wp-includes/class-walker-page-dropdown.php b/wp-includes/class-walker-page-dropdown.php
index 047098b25b..7d2b8523fb 100644
--- a/wp-includes/class-walker-page-dropdown.php
+++ b/wp-includes/class-walker-page-dropdown.php
@@ -20,7 +20,6 @@ class Walker_PageDropdown extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -31,7 +30,6 @@ class Walker_PageDropdown extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var array
 	 *
 	 * @see Walker::$db_fields
@@ -43,7 +41,6 @@ class Walker_PageDropdown extends Walker {
 	 * Starts the element output.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::start_el()
 	 *
diff --git a/wp-includes/class-walker-page.php b/wp-includes/class-walker-page.php
index 8bec66f417..cb2ba59c40 100644
--- a/wp-includes/class-walker-page.php
+++ b/wp-includes/class-walker-page.php
@@ -20,7 +20,6 @@ class Walker_Page extends Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see Walker::$tree_type
@@ -31,7 +30,6 @@ class Walker_Page extends Walker {
 	 * Database fields to use.
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var array
 	 *
 	 * @see Walker::$db_fields
@@ -43,7 +41,6 @@ class Walker_Page extends Walker {
 	 * Outputs the beginning of the current level in the tree before elements are output.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::start_lvl()
 	 *
@@ -68,7 +65,6 @@ class Walker_Page extends Walker {
 	 * Outputs the end of the current level in the tree after elements are output.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::end_lvl()
 	 *
@@ -94,7 +90,6 @@ class Walker_Page extends Walker {
 	 *
 	 * @see Walker::start_el()
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string  $output       Used to append additional content. Passed by reference.
 	 * @param WP_Post $page         Page data object.
@@ -214,7 +209,6 @@ class Walker_Page extends Walker {
 	 * Outputs the end of the current element in the tree.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see Walker::end_el()
 	 *
diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index 7bb4881ece..734a04827d 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -33,7 +33,6 @@ class WP_Admin_Bar {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function initialize() {
 		$this->user = new stdClass;
@@ -100,7 +99,6 @@ class WP_Admin_Bar {
 	 *
 	 * @since 3.1.0
 	 * @since 4.5.0 Added the ability to pass 'lang' and 'dir' meta data.
-	 * @access public
 	 *
 	 * @param array $args {
 	 *     Arguments for adding a node.
@@ -258,7 +256,6 @@ class WP_Admin_Bar {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function render() {
 		$root = $this->_bind();
@@ -572,7 +569,6 @@ class WP_Admin_Bar {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function add_menus() {
 		// User related, aligned right.
diff --git a/wp-includes/class-wp-ajax-response.php b/wp-includes/class-wp-ajax-response.php
index a86d8dd532..7123d1076f 100644
--- a/wp-includes/class-wp-ajax-response.php
+++ b/wp-includes/class-wp-ajax-response.php
@@ -39,7 +39,6 @@ class WP_Ajax_Response {
 	 *     </response>
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string|array $args {
 	 *     Optional. An array or string of XML response arguments.
diff --git a/wp-includes/class-wp-comment-query.php b/wp-includes/class-wp-comment-query.php
index df79c2a7a5..4365e1753f 100644
--- a/wp-includes/class-wp-comment-query.php
+++ b/wp-includes/class-wp-comment-query.php
@@ -20,7 +20,6 @@ class WP_Comment_Query {
 	 * SQL for database query.
 	 *
 	 * @since 4.0.1
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -29,7 +28,6 @@ class WP_Comment_Query {
 	 * Metadata query container
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var object WP_Meta_Query
 	 */
 	public $meta_query = false;
@@ -38,7 +36,6 @@ class WP_Comment_Query {
 	 * Metadata query clauses.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $meta_query_clauses;
@@ -47,7 +44,6 @@ class WP_Comment_Query {
 	 * SQL query clauses.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sql_clauses = array(
@@ -65,7 +61,6 @@ class WP_Comment_Query {
 	 * Stored after the {@see 'comments_clauses'} filter is run on the compiled WHERE sub-clauses.
 	 *
 	 * @since 4.4.2
-	 * @access protected
 	 * @var string
 	 */
 	protected $filtered_where_clause;
@@ -74,7 +69,6 @@ class WP_Comment_Query {
 	 * Date query container
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var object WP_Date_Query
 	 */
 	public $date_query = false;
@@ -83,7 +77,6 @@ class WP_Comment_Query {
 	 * Query vars set by the user.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars;
@@ -92,7 +85,6 @@ class WP_Comment_Query {
 	 * Default values for query vars.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_var_defaults;
@@ -101,7 +93,6 @@ class WP_Comment_Query {
 	 * List of comments located by the query.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $comments;
@@ -110,7 +101,6 @@ class WP_Comment_Query {
 	 * The amount of found comments for the current query.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $found_comments = 0;
@@ -119,7 +109,6 @@ class WP_Comment_Query {
 	 * The number of pages.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $max_num_pages = 0;
@@ -128,7 +117,6 @@ class WP_Comment_Query {
 	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
@@ -152,7 +140,6 @@ class WP_Comment_Query {
 	 *              `$hierarchical`, and `$update_comment_post_cache` were added.
 	 * @since 4.5.0 Introduced the `$author_url` argument.
 	 * @since 4.6.0 Introduced the `$cache_domain` argument.
-	 * @access public
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or query string of comment query parameters. Default empty.
@@ -317,7 +304,6 @@ class WP_Comment_Query {
 	 *
 	 * @since 4.2.0 Extracted from WP_Comment_Query::query().
 	 *
-	 * @access public
 	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
@@ -347,7 +333,6 @@ class WP_Comment_Query {
 	 *              'post__not_in', 'include_unapproved', 'type__in', and 'type__not_in'
 	 *              arguments to $query_vars.
 	 * @since 4.2.0 Moved parsing to WP_Comment_Query::parse_query().
-	 * @access public
 	 *
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of comments, or number of comments when 'count' is passed as a query var.
@@ -361,7 +346,6 @@ class WP_Comment_Query {
 	 * Get a list of comments matching the query vars.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -476,7 +460,6 @@ class WP_Comment_Query {
 	 * Used internally to get a list of comment IDs matching the query vars.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -906,7 +889,6 @@ class WP_Comment_Query {
 	 * query if the limit clause was used.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -935,8 +917,7 @@ class WP_Comment_Query {
 	 * the descendant trees for all matched top-level comments.
 	 *
 	 * @since 4.4.0
-	 * @access protected
-	 * 
+	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param array $comments Array of top-level comments whose descendants should be filled in.
@@ -1050,7 +1031,6 @@ class WP_Comment_Query {
 	 * Used internally to generate an SQL string for searching across multiple columns
 	 *
 	 * @since 3.1.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -1075,7 +1055,6 @@ class WP_Comment_Query {
 	 * Parse and sanitize 'orderby' keys passed to the comment query.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -1139,7 +1118,6 @@ class WP_Comment_Query {
 	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
diff --git a/wp-includes/class-wp-comment.php b/wp-includes/class-wp-comment.php
index 0e9f88a352..d3b96a32dc 100644
--- a/wp-includes/class-wp-comment.php
+++ b/wp-includes/class-wp-comment.php
@@ -18,7 +18,6 @@ final class WP_Comment {
 	 * Comment ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment_ID;
@@ -27,7 +26,6 @@ final class WP_Comment {
 	 * ID of the post the comment is associated with.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment_post_ID = 0;
@@ -36,7 +34,6 @@ final class WP_Comment {
 	 * Comment author name.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_author = '';
@@ -45,7 +42,6 @@ final class WP_Comment {
 	 * Comment author email address.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_author_email = '';
@@ -54,7 +50,6 @@ final class WP_Comment {
 	 * Comment author URL.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_author_url = '';
@@ -63,7 +58,6 @@ final class WP_Comment {
 	 * Comment author IP address (IPv4 format).
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_author_IP = '';
@@ -72,7 +66,6 @@ final class WP_Comment {
 	 * Comment date in YYYY-MM-DD HH:MM:SS format.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_date = '0000-00-00 00:00:00';
@@ -81,7 +74,6 @@ final class WP_Comment {
 	 * Comment GMT date in YYYY-MM-DD HH::MM:SS format.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_date_gmt = '0000-00-00 00:00:00';
@@ -90,7 +82,6 @@ final class WP_Comment {
 	 * Comment content.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_content;
@@ -99,7 +90,6 @@ final class WP_Comment {
 	 * Comment karma count.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment_karma = 0;
@@ -108,7 +98,6 @@ final class WP_Comment {
 	 * Comment approval status.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_approved = '1';
@@ -117,7 +106,6 @@ final class WP_Comment {
 	 * Comment author HTTP user agent.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_agent = '';
@@ -126,7 +114,6 @@ final class WP_Comment {
 	 * Comment type.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_type = '';
@@ -135,7 +122,6 @@ final class WP_Comment {
 	 * Parent comment ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment_parent = 0;
@@ -144,7 +130,6 @@ final class WP_Comment {
 	 * Comment author ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $user_id = 0;
@@ -153,7 +138,6 @@ final class WP_Comment {
 	 * Comment children.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $children;
@@ -162,7 +146,6 @@ final class WP_Comment {
 	 * Whether children have been populated for this comment object.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $populated_children = false;
@@ -171,7 +154,6 @@ final class WP_Comment {
 	 * Post fields.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $post_fields = array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_content_filtered', 'post_parent', 'guid', 'menu_order', 'post_type', 'post_mime_type', 'comment_count' );
@@ -180,7 +162,6 @@ final class WP_Comment {
 	 * Retrieves a WP_Comment instance.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @static
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
@@ -217,7 +198,6 @@ final class WP_Comment {
 	 * Populates properties with object vars.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_Comment $comment Comment object.
 	 */
@@ -231,7 +211,6 @@ final class WP_Comment {
 	 * Convert object to array.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Object as array.
 	 */
@@ -243,7 +222,6 @@ final class WP_Comment {
 	 * Get the children of a comment.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $args {
 	 *     Array of arguments used to pass to get_comments() and determine format.
@@ -318,7 +296,6 @@ final class WP_Comment {
 	 * Used by `WP_Comment_Query` when bulk-filling descendants.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_Comment $child Child comment.
 	 */
@@ -330,7 +307,6 @@ final class WP_Comment {
 	 * Get a child comment by ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param int $child_id ID of the child.
 	 * @return WP_Comment|bool Returns the comment object if found, otherwise false.
@@ -363,7 +339,6 @@ final class WP_Comment {
 	 * If `$name` matches a post field, the comment post will be loaded and the post's value checked.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $name Property name.
 	 * @return bool
@@ -381,7 +356,6 @@ final class WP_Comment {
 	 * If `$name` matches a post field, the comment post will be loaded and the post's value returned.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $name
 	 * @return mixed
diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 267989da5e..b9c83c7575 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -22,7 +22,6 @@ class WP_Customize_Control {
 	 * @since 4.1.0
 	 *
 	 * @static
-	 * @access protected
 	 * @var int
 	 */
 	protected static $instance_count = 0;
@@ -31,7 +30,6 @@ class WP_Customize_Control {
 	 * Order in which this instance was created in relation to other instances.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $instance_number;
@@ -40,7 +38,6 @@ class WP_Customize_Control {
 	 * Customizer manager.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -49,7 +46,6 @@ class WP_Customize_Control {
 	 * Control ID.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $id;
@@ -58,7 +54,6 @@ class WP_Customize_Control {
 	 * All settings tied to the control.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var array
 	 */
 	public $settings;
@@ -67,7 +62,6 @@ class WP_Customize_Control {
 	 * The primary setting for the control (if there is one).
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $setting = 'default';
@@ -79,7 +73,6 @@ class WP_Customize_Control {
 	 * of the associated `$settings`.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $capability;
@@ -88,7 +81,6 @@ class WP_Customize_Control {
 	 * Order priority to load the control in Customizer.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $priority = 10;
@@ -97,7 +89,6 @@ class WP_Customize_Control {
 	 * Section the control belongs to.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $section = '';
@@ -106,7 +97,6 @@ class WP_Customize_Control {
 	 * Label for the control.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $label = '';
@@ -115,7 +105,6 @@ class WP_Customize_Control {
 	 * Description for the control.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $description = '';
@@ -124,7 +113,6 @@ class WP_Customize_Control {
 	 * List of choices for 'radio' or 'select' type controls, where values are the keys, and labels are the values.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var array
 	 */
 	public $choices = array();
@@ -135,7 +123,6 @@ class WP_Customize_Control {
 	 * Not used for 'checkbox', 'radio', 'select', 'textarea', or 'dropdown-pages' control types.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $input_attrs = array();
@@ -144,7 +131,6 @@ class WP_Customize_Control {
 	 * Show UI for adding new content, currently only used for the dropdown-pages control.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $allow_addition = false;
@@ -152,7 +138,6 @@ class WP_Customize_Control {
 	/**
 	 * @deprecated It is better to just call the json() method
 	 * @since 3.4.0
-	 * @access public
 	 * @var array
 	 */
 	public $json = array();
@@ -161,7 +146,6 @@ class WP_Customize_Control {
 	 * Control's Type.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'text';
@@ -170,7 +154,6 @@ class WP_Customize_Control {
 	 * Callback.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Control::active()
 	 *
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 9330d2789b..b26833beb7 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -25,7 +25,6 @@ final class WP_Customize_Manager {
 	 * An instance of the theme being previewed.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var WP_Theme
 	 */
 	protected $theme;
@@ -34,7 +33,6 @@ final class WP_Customize_Manager {
 	 * The directory name of the previously active theme (within the theme_root).
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $original_stylesheet;
@@ -43,7 +41,6 @@ final class WP_Customize_Manager {
 	 * Whether this is a Customizer pageload.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $previewing = false;
@@ -52,7 +49,6 @@ final class WP_Customize_Manager {
 	 * Methods and properties dealing with managing widgets in the Customizer.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 * @var WP_Customize_Widgets
 	 */
 	public $widgets;
@@ -61,7 +57,6 @@ final class WP_Customize_Manager {
 	 * Methods and properties dealing with managing nav menus in the Customizer.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Customize_Nav_Menus
 	 */
 	public $nav_menus;
@@ -70,7 +65,6 @@ final class WP_Customize_Manager {
 	 * Methods and properties dealing with selective refresh in the Customizer preview.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var WP_Customize_Selective_Refresh
 	 */
 	public $selective_refresh;
@@ -79,7 +73,6 @@ final class WP_Customize_Manager {
 	 * Registered instances of WP_Customize_Setting.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $settings = array();
@@ -88,7 +81,6 @@ final class WP_Customize_Manager {
 	 * Sorted top-level instances of WP_Customize_Panel and WP_Customize_Section.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $containers = array();
@@ -97,7 +89,6 @@ final class WP_Customize_Manager {
 	 * Registered instances of WP_Customize_Panel.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $panels = array();
@@ -106,7 +97,6 @@ final class WP_Customize_Manager {
 	 * List of core components.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $components = array( 'widgets', 'nav_menus' );
@@ -115,7 +105,6 @@ final class WP_Customize_Manager {
 	 * Registered instances of WP_Customize_Section.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sections = array();
@@ -124,7 +113,6 @@ final class WP_Customize_Manager {
 	 * Registered instances of WP_Customize_Control.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $controls = array();
@@ -133,7 +121,6 @@ final class WP_Customize_Manager {
 	 * Panel types that may be rendered from JS templates.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $registered_panel_types = array();
@@ -142,7 +129,6 @@ final class WP_Customize_Manager {
 	 * Section types that may be rendered from JS templates.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $registered_section_types = array();
@@ -151,7 +137,6 @@ final class WP_Customize_Manager {
 	 * Control types that may be rendered from JS templates.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $registered_control_types = array();
@@ -160,7 +145,6 @@ final class WP_Customize_Manager {
 	 * Initial URL being previewed.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $preview_url;
@@ -169,7 +153,6 @@ final class WP_Customize_Manager {
 	 * URL to link the user to when closing the Customizer.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $return_url;
@@ -178,7 +161,6 @@ final class WP_Customize_Manager {
 	 * Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $autofocus = array();
@@ -187,7 +169,6 @@ final class WP_Customize_Manager {
 	 * Messenger channel.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $messenger_channel;
@@ -203,7 +184,6 @@ final class WP_Customize_Manager {
 	 * Changeset UUID.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var string
 	 */
 	private $_changeset_uuid;
@@ -212,7 +192,6 @@ final class WP_Customize_Manager {
 	 * Changeset post ID.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var int|false
 	 */
 	private $_changeset_post_id;
@@ -221,7 +200,6 @@ final class WP_Customize_Manager {
 	 * Changeset data loaded from a customize_changeset post.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $_changeset_data;
@@ -373,7 +351,6 @@ final class WP_Customize_Manager {
 	 *
 	 * @since 3.4.0
 	 * @since 4.2.0 Added `$action` param.
-	 * @access public
 	 *
 	 * @param string|null $action Whether the supplied Ajax action is being run.
 	 * @return bool True if it's an Ajax request, false otherwise.
@@ -648,7 +625,6 @@ final class WP_Customize_Manager {
 	 * Get the changeset UUID.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string UUID.
 	 */
@@ -718,7 +694,6 @@ final class WP_Customize_Manager {
 	 * Get the registered panels.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @return array Panels.
 	 */
@@ -798,7 +773,6 @@ final class WP_Customize_Manager {
 	 * Find the changeset post ID for a given changeset UUID.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $uuid Changeset UUID.
 	 * @return int|null Returns post ID on success and null on failure.
@@ -835,7 +809,6 @@ final class WP_Customize_Manager {
 	 * Get the changeset post id for the loaded changeset.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return int|null Post ID on success or null if there is no post yet saved.
 	 */
@@ -857,7 +830,6 @@ final class WP_Customize_Manager {
 	 * Get the data stored in a changeset post.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int $post_id Changeset post ID.
 	 * @return array|WP_Error Changeset data or WP_Error on error.
@@ -887,7 +859,6 @@ final class WP_Customize_Manager {
 	 * Get changeset data.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Changeset data.
 	 */
@@ -913,7 +884,6 @@ final class WP_Customize_Manager {
 	 * Starter content setting IDs.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	protected $pending_starter_content_settings_ids = array();
@@ -922,7 +892,6 @@ final class WP_Customize_Manager {
 	 * Import theme starter content into the customized state.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $starter_content Starter content. Defaults to `get_theme_starter_content()`.
 	 */
@@ -1315,7 +1284,6 @@ final class WP_Customize_Manager {
 	 * Ensure that the attachments are valid and that they have slugs and file name/path.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param array $attachments Attachments.
 	 * @return array Prepared attachments.
@@ -1376,7 +1344,6 @@ final class WP_Customize_Manager {
 	 * Save starter content changeset.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 */
 	public function _save_starter_content_changeset() {
 
@@ -1485,7 +1452,6 @@ final class WP_Customize_Manager {
 	 * @since 3.4.0
 	 * @since 4.1.1 Introduced the `$default` parameter.
 	 * @since 4.6.0 `$default` is now returned early when the setting post value is invalid.
-	 * @access public
 	 *
 	 * @see WP_REST_Server::dispatch()
 	 * @see WP_Rest_Request::sanitize_params()
@@ -1520,7 +1486,6 @@ final class WP_Customize_Manager {
 	 * exclusively sourced from `$_POST['customized']`.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
@@ -1618,7 +1583,6 @@ final class WP_Customize_Manager {
 	 * Filter the X-Frame-Options and Content-Security-Policy headers to ensure frontend can load in customizer.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $headers Headers.
 	 * @return array Headers.
@@ -1634,7 +1598,6 @@ final class WP_Customize_Manager {
 	 * Add customize state query params to a given URL if preview is allowed.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @see wp_redirect()
 	 * @see WP_Customize_Manager::get_allowed_url()
 	 *
@@ -1680,7 +1643,6 @@ final class WP_Customize_Manager {
 	 *
 	 * @since 4.0.0
 	 * @deprecated 4.7.0
-	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
 		_deprecated_function( __METHOD__, '4.7.0' );
@@ -1710,7 +1672,6 @@ final class WP_Customize_Manager {
 	 * Print CSS for loading indicators for the Customizer preview.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 */
 	public function customize_preview_loading_style() {
 		?><style>
@@ -1741,7 +1702,6 @@ final class WP_Customize_Manager {
 	 * work as expected since the parent frame is not being sent the URL to navigate to.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function remove_frameless_preview_messenger_channel() {
 		if ( ! $this->messenger_channel ) {
@@ -1991,7 +1951,6 @@ final class WP_Customize_Manager {
 	 * after sanitizing are marked invalid.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @see WP_REST_Request::has_valid_params()
 	 * @see WP_Customize_Setting::validate()
@@ -2058,7 +2017,6 @@ final class WP_Customize_Manager {
 	 * `wp.customize.Notification` JS model.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param true|WP_Error $validity Setting validity.
 	 * @return true|array If `$validity` was a WP_Error, the error codes will be array-mapped
@@ -2225,7 +2183,6 @@ final class WP_Customize_Manager {
 	 * Save the post for the loaded changeset.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $args {
 	 *     Args for changeset post.
@@ -2569,7 +2526,6 @@ final class WP_Customize_Manager {
 	 * Whether a changeset revision should be made.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var bool
 	 */
 	protected $store_changeset_revision;
@@ -2580,7 +2536,6 @@ final class WP_Customize_Manager {
 	 * Note that this will not be called while a changeset post remains in auto-draft status.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param bool    $post_has_changed Whether the post has changed.
 	 * @param WP_Post $last_revision    The last revision post object.
@@ -2610,7 +2565,6 @@ final class WP_Customize_Manager {
 	 * invoking this method.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @see _wp_customize_publish_changeset()
 	 *
 	 * @param int $changeset_post_id ID for customize_changeset post. Defaults to the changeset for the current manager instance.
@@ -2761,7 +2715,6 @@ final class WP_Customize_Manager {
 	 * Update stashed theme mod settings.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param array $inactive_theme_mod_settings Mapping of stylesheet to arrays of theme mod settings.
 	 * @return array|false Returns array of updated stashed theme mods or false if the update failed or there were no changes.
@@ -2865,7 +2818,6 @@ final class WP_Customize_Manager {
 	 * even though they are not directly created statically with code.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return array The WP_Customize_Setting objects added.
@@ -2977,7 +2929,6 @@ final class WP_Customize_Manager {
 	 * Retrieve a customize panel.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
@@ -2992,7 +2943,6 @@ final class WP_Customize_Manager {
 	 * Remove a customize panel.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
@@ -3016,7 +2966,6 @@ final class WP_Customize_Manager {
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Panel
 	 *
@@ -3030,7 +2979,6 @@ final class WP_Customize_Manager {
 	 * Render JS templates for all registered panel types.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_panel_templates() {
 		foreach ( $this->registered_panel_types as $panel_type ) {
@@ -3044,7 +2992,6 @@ final class WP_Customize_Manager {
 	 *
 	 * @since 3.4.0
 	 * @since 4.5.0 Return added WP_Customize_Section instance.
-	 * @access public
 	 *
 	 * @param WP_Customize_Section|string $id   Customize Section object, or Section ID.
 	 * @param array                     $args {
@@ -3103,7 +3050,6 @@ final class WP_Customize_Manager {
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Section
 	 *
@@ -3117,7 +3063,6 @@ final class WP_Customize_Manager {
 	 * Render JS templates for all registered section types.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_section_templates() {
 		foreach ( $this->registered_section_types as $section_type ) {
@@ -3131,7 +3076,6 @@ final class WP_Customize_Manager {
 	 *
 	 * @since 3.4.0
 	 * @since 4.5.0 Return added WP_Customize_Control instance.
-	 * @access public
 	 *
 	 * @param WP_Customize_Control|string $id   Customize Control object, or ID.
 	 * @param array                       $args {
@@ -3197,7 +3141,6 @@ final class WP_Customize_Manager {
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        WP_Customize_Control.
@@ -3210,7 +3153,6 @@ final class WP_Customize_Manager {
 	 * Render JS templates for all registered control types.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 */
 	public function render_control_templates() {
 		foreach ( $this->registered_control_types as $control_type ) {
@@ -3350,7 +3292,6 @@ final class WP_Customize_Manager {
 	 * Determine whether the user agent is iOS.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return bool Whether the user agent is iOS.
 	 */
@@ -3362,7 +3303,6 @@ final class WP_Customize_Manager {
 	 * Get the template string for the Customizer pane document title.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string The template string for the document title.
 	 */
@@ -3384,7 +3324,6 @@ final class WP_Customize_Manager {
 	 * URL is validated.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
@@ -3397,7 +3336,6 @@ final class WP_Customize_Manager {
 	 * Get the initial URL to be previewed.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string URL being previewed.
 	 */
@@ -3414,7 +3352,6 @@ final class WP_Customize_Manager {
 	 * Determines whether the admin and the frontend are on different domains.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return bool Whether cross-domain.
 	 */
@@ -3436,7 +3373,6 @@ final class WP_Customize_Manager {
 	 * using the customize_allowed_urls filter.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @returns array Allowed URLs.
 	 */
@@ -3463,7 +3399,6 @@ final class WP_Customize_Manager {
 	 * Get messenger channel.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string Messenger channel.
 	 */
@@ -3477,7 +3412,6 @@ final class WP_Customize_Manager {
 	 * URL is validated.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $return_url URL for return link.
 	 */
@@ -3492,7 +3426,6 @@ final class WP_Customize_Manager {
 	 * Get URL to link the user to when closing the Customizer.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string URL for link to close Customizer.
 	 */
@@ -3516,7 +3449,6 @@ final class WP_Customize_Manager {
 	 * Set the autofocused constructs.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $autofocus {
 	 *     Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
@@ -3534,7 +3466,6 @@ final class WP_Customize_Manager {
 	 * Get the autofocused constructs.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array {
 	 *     Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
@@ -4265,7 +4196,6 @@ final class WP_Customize_Manager {
 	 * Add settings from the POST data that were not added with code, e.g. dynamically-created settings for Widgets
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @see add_dynamic_settings()
 	 */
diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 485c29761a..fdf45e5229 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -22,7 +22,6 @@ final class WP_Customize_Nav_Menus {
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -31,7 +30,6 @@ final class WP_Customize_Nav_Menus {
 	 * Previewed Menus.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var array
 	 */
 	public $previewed_menus;
@@ -40,7 +38,6 @@ final class WP_Customize_Nav_Menus {
 	 * Constructor.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
@@ -77,7 +74,6 @@ final class WP_Customize_Nav_Menus {
 	 * Adds a nonce for customizing menus.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array $nonces Array of nonces.
 	 * @return array $nonces Modified array of nonces.
@@ -91,7 +87,6 @@ final class WP_Customize_Nav_Menus {
 	 * Ajax handler for loading available menu items.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function ajax_load_available_items() {
 		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
@@ -135,7 +130,6 @@ final class WP_Customize_Nav_Menus {
 	 * Performs the post_type and taxonomy queries for loading available menu items.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param string $type   Optional. Accepts any custom object type and has built-in support for
 	 *                         'post_type' and 'taxonomy'. Default is 'post_type'.
@@ -258,7 +252,6 @@ final class WP_Customize_Nav_Menus {
 	 * Ajax handler for searching available menu items.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function ajax_search_available_items() {
 		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
@@ -292,7 +285,6 @@ final class WP_Customize_Nav_Menus {
 	 * Based on WP_Editor::wp_link_query().
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
@@ -395,7 +387,6 @@ final class WP_Customize_Nav_Menus {
 	 * Enqueue scripts and styles for Customizer pane.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function enqueue_scripts() {
 		wp_enqueue_style( 'customize-nav-menus' );
@@ -480,7 +471,6 @@ final class WP_Customize_Nav_Menus {
 	 * the WP_Customize_Setting constructor.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
@@ -505,7 +495,6 @@ final class WP_Customize_Nav_Menus {
 	 * Allow non-statically created settings to be constructed with custom WP_Customize_Setting subclass.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param string $setting_class WP_Customize_Setting or a subclass.
 	 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
@@ -527,7 +516,6 @@ final class WP_Customize_Nav_Menus {
 	 * Add the customizer settings and controls.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function customize_register() {
 
@@ -708,7 +696,6 @@ final class WP_Customize_Nav_Menus {
 	 * intval because the second argument is not what intval() expects.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
@@ -722,7 +709,6 @@ final class WP_Customize_Nav_Menus {
 	 *
 	 * @since 4.3.0
 	 * @since 4.7.0  Each array item now includes a `$type_label` in in addition to `$title`, `$type`, and `$object`.
-	 * @access public
 	 *
 	 * @return array The available menu item types.
 	 */
@@ -772,7 +758,6 @@ final class WP_Customize_Nav_Menus {
 	/**
 	 * Add a new `auto-draft` post.
 	 *
-	 * @access public
 	 * @since 4.7.0
 	 *
 	 * @param array $postarr {
@@ -822,7 +807,6 @@ final class WP_Customize_Nav_Menus {
 	/**
 	 * Ajax handler for adding a new auto-draft post.
 	 *
-	 * @access public
 	 * @since 4.7.0
 	 */
 	public function ajax_insert_auto_draft_post() {
@@ -899,7 +883,6 @@ final class WP_Customize_Nav_Menus {
 	 * Templates are imported into the JS use wp.template.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function print_templates() {
 		?>
@@ -942,7 +925,6 @@ final class WP_Customize_Nav_Menus {
 	 * Print the html template used to render the add-menu-item frame.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function available_items_template() {
 		?>
@@ -1003,7 +985,6 @@ final class WP_Customize_Nav_Menus {
 	 * To be used in the template #available-menu-items.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param array $available_item_type Menu item data to output, including title, type, and label.
 	 * @return void
@@ -1043,7 +1024,6 @@ final class WP_Customize_Nav_Menus {
 	 * Print the markup for available menu item custom links.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @return void
 	 */
@@ -1086,7 +1066,6 @@ final class WP_Customize_Nav_Menus {
 	 * Nav menu args used for each instance, keyed by the args HMAC.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var array
 	 */
 	public $preview_nav_menu_instance_args = array();
@@ -1095,7 +1074,6 @@ final class WP_Customize_Nav_Menus {
 	 * Filters arguments for dynamic nav_menu selective refresh partials.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array|false $partial_args Partial args.
 	 * @param string      $partial_id   Partial ID.
@@ -1126,7 +1104,6 @@ final class WP_Customize_Nav_Menus {
 	 * Add hooks for the Customizer preview.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function customize_preview_init() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
@@ -1140,7 +1117,6 @@ final class WP_Customize_Nav_Menus {
 	 * Make the auto-draft status protected so that it can be queried.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @global array $wp_post_statuses List of post statuses.
 	 */
@@ -1153,7 +1129,6 @@ final class WP_Customize_Nav_Menus {
 	 * Sanitize post IDs for auto-draft posts created for nav menu items to be published.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $value Post IDs.
 	 * @returns array Post IDs.
@@ -1189,7 +1164,6 @@ final class WP_Customize_Nav_Menus {
 	 * post is not an auto-draft.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Setting $setting Customizer setting object.
 	 */
@@ -1219,7 +1193,6 @@ final class WP_Customize_Nav_Menus {
 	 * Keep track of the arguments that are being passed to wp_nav_menu().
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @see wp_nav_menu()
 	 * @see WP_Customize_Widgets_Partial_Refresh::filter_dynamic_sidebar_params()
 	 *
@@ -1287,7 +1260,6 @@ final class WP_Customize_Nav_Menus {
 	 * Injects attributes into container element.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_nav_menu()
 	 *
@@ -1312,7 +1284,6 @@ final class WP_Customize_Nav_Menus {
 	 * Note that the array is expected to be pre-sorted.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param array $args The arguments to hash.
 	 * @return string Hashed nav menu arguments.
@@ -1325,7 +1296,6 @@ final class WP_Customize_Nav_Menus {
 	 * Enqueue scripts for the Customizer preview.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
 		wp_enqueue_script( 'customize-preview-nav-menus' ); // Note that we have overridden this.
@@ -1335,7 +1305,6 @@ final class WP_Customize_Nav_Menus {
 	 * Exports data from PHP to JS.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function export_preview_data() {
 
@@ -1350,7 +1319,6 @@ final class WP_Customize_Nav_Menus {
 	 * Export any wp_nav_menu() calls during the rendering of any partials.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array $response Response.
 	 * @return array Response.
@@ -1364,7 +1332,6 @@ final class WP_Customize_Nav_Menus {
 	 * Render a specific menu via wp_nav_menu() using the supplied arguments.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_nav_menu()
 	 *
diff --git a/wp-includes/class-wp-customize-panel.php b/wp-includes/class-wp-customize-panel.php
index 87ae392e97..de839f5ce0 100644
--- a/wp-includes/class-wp-customize-panel.php
+++ b/wp-includes/class-wp-customize-panel.php
@@ -26,7 +26,6 @@ class WP_Customize_Panel {
 	 * @since 4.1.0
 	 *
 	 * @static
-	 * @access protected
 	 * @var int
 	 */
 	protected static $instance_count = 0;
@@ -35,7 +34,6 @@ class WP_Customize_Panel {
 	 * Order in which this instance was created in relation to other instances.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $instance_number;
@@ -44,7 +42,6 @@ class WP_Customize_Panel {
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -53,7 +50,6 @@ class WP_Customize_Panel {
 	 * Unique identifier.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $id;
@@ -62,7 +58,6 @@ class WP_Customize_Panel {
 	 * Priority of the panel, defining the display order of panels and sections.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var integer
 	 */
 	public $priority = 160;
@@ -71,7 +66,6 @@ class WP_Customize_Panel {
 	 * Capability required for the panel.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $capability = 'edit_theme_options';
@@ -80,7 +74,6 @@ class WP_Customize_Panel {
 	 * Theme feature support for the panel.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string|array
 	 */
 	public $theme_supports = '';
@@ -89,7 +82,6 @@ class WP_Customize_Panel {
 	 * Title of the panel to show in UI.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $title = '';
@@ -98,7 +90,6 @@ class WP_Customize_Panel {
 	 * Description to show in the UI.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $description = '';
@@ -107,7 +98,6 @@ class WP_Customize_Panel {
 	 * Auto-expand a section in a panel when the panel is expanded when the panel only has the one section.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var bool
 	 */
 	public $auto_expand_sole_section = false;
@@ -116,7 +106,6 @@ class WP_Customize_Panel {
 	 * Customizer sections for this panel.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $sections;
@@ -125,7 +114,6 @@ class WP_Customize_Panel {
 	 * Type of this panel.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'default';
@@ -134,7 +122,6 @@ class WP_Customize_Panel {
 	 * Active callback.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Section::active()
 	 *
@@ -179,7 +166,6 @@ class WP_Customize_Panel {
 	 * Check whether panel is active to current Customizer preview.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @return bool Whether the panel is active to the current preview.
 	 */
@@ -207,7 +193,6 @@ class WP_Customize_Panel {
 	 * provide an 'active_callback' argument to the constructor.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @return bool Always true.
 	 */
@@ -303,7 +288,6 @@ class WP_Customize_Panel {
 	 * Panel containers are now rendered in JS by default, see WP_Customize_Panel::print_template().
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 */
 	protected function render() {}
 
@@ -313,7 +297,6 @@ class WP_Customize_Panel {
 	 * Panel contents are now rendered in JS by default, see WP_Customize_Panel::print_template().
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 */
 	protected function render_content() {}
 
@@ -347,7 +330,6 @@ class WP_Customize_Panel {
 	 * @see WP_Customize_Panel::print_template()
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function render_template() {
 		?>
@@ -370,7 +352,6 @@ class WP_Customize_Panel {
 	 * @see WP_Customize_Panel::print_template()
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function content_template() {
 		?>
diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php
index 68d677133e..57b338bf51 100644
--- a/wp-includes/class-wp-customize-section.php
+++ b/wp-includes/class-wp-customize-section.php
@@ -26,7 +26,6 @@ class WP_Customize_Section {
 	 * @since 4.1.0
 	 *
 	 * @static
-	 * @access protected
 	 * @var int
 	 */
 	protected static $instance_count = 0;
@@ -35,7 +34,6 @@ class WP_Customize_Section {
 	 * Order in which this instance was created in relation to other instances.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $instance_number;
@@ -44,7 +42,6 @@ class WP_Customize_Section {
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -53,7 +50,6 @@ class WP_Customize_Section {
 	 * Unique identifier.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $id;
@@ -62,7 +58,6 @@ class WP_Customize_Section {
 	 * Priority of the section which informs load order of sections.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var integer
 	 */
 	public $priority = 160;
@@ -71,7 +66,6 @@ class WP_Customize_Section {
 	 * Panel in which to show the section, making it a sub-section.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $panel = '';
@@ -80,7 +74,6 @@ class WP_Customize_Section {
 	 * Capability required for the section.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $capability = 'edit_theme_options';
@@ -89,7 +82,6 @@ class WP_Customize_Section {
 	 * Theme feature support for the section.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string|array
 	 */
 	public $theme_supports = '';
@@ -98,7 +90,6 @@ class WP_Customize_Section {
 	 * Title of the section to show in UI.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $title = '';
@@ -107,7 +98,6 @@ class WP_Customize_Section {
 	 * Description to show in the UI.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $description = '';
@@ -116,7 +106,6 @@ class WP_Customize_Section {
 	 * Customizer controls for this section.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var array
 	 */
 	public $controls;
@@ -125,7 +114,6 @@ class WP_Customize_Section {
 	 * Type of this section.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'default';
@@ -134,7 +122,6 @@ class WP_Customize_Section {
 	 * Active callback.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Section::active()
 	 *
@@ -149,7 +136,6 @@ class WP_Customize_Section {
 	 * Show the description or hide it behind the help icon.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @var bool Indicates whether the Section's description should be
 	 *           hidden behind a help icon ("?") in the Section header,
@@ -191,7 +177,6 @@ class WP_Customize_Section {
 	 * Check whether section is active to current Customizer preview.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @return bool Whether the section is active to the current preview.
 	 */
@@ -219,7 +204,6 @@ class WP_Customize_Section {
 	 * an 'active_callback' argument to the constructor.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @return true Always true.
 	 */
@@ -331,7 +315,6 @@ class WP_Customize_Section {
 	 * WP_Customize_Manager::register_section_type().
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Manager::render_template()
 	 */
@@ -350,7 +333,6 @@ class WP_Customize_Section {
 	 * export custom variables by overriding WP_Customize_Section::json().
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see WP_Customize_Section::print_template()
 	 */
diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php
index 8fab457ce3..601990f532 100644
--- a/wp-includes/class-wp-customize-setting.php
+++ b/wp-includes/class-wp-customize-setting.php
@@ -21,7 +21,6 @@ class WP_Customize_Setting {
 	 * Customizer bootstrap instance.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -30,7 +29,6 @@ class WP_Customize_Setting {
 	 * Unique string identifier for the setting.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $id;
@@ -39,7 +37,6 @@ class WP_Customize_Setting {
 	 * Type of customize settings.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'theme_mod';
@@ -48,7 +45,6 @@ class WP_Customize_Setting {
 	 * Capability required to edit this setting.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string|array
 	 */
 	public $capability = 'edit_theme_options';
@@ -57,7 +53,6 @@ class WP_Customize_Setting {
 	 * Feature a theme is required to support to enable this setting.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $theme_supports = '';
@@ -66,7 +61,6 @@ class WP_Customize_Setting {
 	 * The default value for the setting.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $default = '';
@@ -80,7 +74,6 @@ class WP_Customize_Setting {
 	 * @link https://developer.wordpress.org/themes/customize-api
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $transport = 'refresh';
@@ -89,7 +82,6 @@ class WP_Customize_Setting {
 	 * Server-side validation callback for the setting's value.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var callable
 	 */
 	public $validate_callback = '';
@@ -98,7 +90,6 @@ class WP_Customize_Setting {
 	 * Callback to filter a Customize setting value in un-slashed form.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var callable
 	 */
 	public $sanitize_callback = '';
@@ -107,7 +98,6 @@ class WP_Customize_Setting {
 	 * Callback to convert a Customize PHP setting value to a value that is JSON serializable.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $sanitize_js_callback = '';
@@ -121,7 +111,6 @@ class WP_Customize_Setting {
 	 * from the start.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var bool
 	 */
 	public $dirty = false;
@@ -130,7 +119,6 @@ class WP_Customize_Setting {
 	 * ID Data.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $id_data = array();
@@ -139,7 +127,6 @@ class WP_Customize_Setting {
 	 * Whether or not preview() was called.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $is_previewed = false;
@@ -149,7 +136,6 @@ class WP_Customize_Setting {
 	 *
 	 * @since 4.4.0
 	 * @static
-	 * @access protected
 	 * @var array
 	 */
 	protected static $aggregated_multidimensionals = array();
@@ -158,7 +144,6 @@ class WP_Customize_Setting {
 	 * Whether the multidimensional setting is aggregated.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $is_multidimensional_aggregated = false;
@@ -277,7 +262,6 @@ class WP_Customize_Setting {
 	 * The ID for the current site when the preview() method was called.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var int
 	 */
 	protected $_previewed_blog_id;
@@ -301,7 +285,6 @@ class WP_Customize_Setting {
 	 *
 	 * @see WP_Customize_Setting::preview()
 	 * @since 4.1.1
-	 * @access protected
 	 * @var mixed
 	 */
 	protected $_original_value;
diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index ecf0c4a97b..b7080acce9 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -22,7 +22,6 @@ final class WP_Customize_Widgets {
 	 * WP_Customize_Manager instance.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -31,7 +30,6 @@ final class WP_Customize_Widgets {
 	 * All id_bases for widgets defined in core.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $core_widget_id_bases = array(
@@ -56,21 +54,18 @@ final class WP_Customize_Widgets {
 
 	/**
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $rendered_sidebars = array();
 
 	/**
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $rendered_widgets = array();
 
 	/**
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $old_sidebars_widgets = array();
@@ -79,7 +74,6 @@ final class WP_Customize_Widgets {
 	 * Mapping of widget ID base to whether it supports selective refresh.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $selective_refreshable_widgets;
@@ -88,7 +82,6 @@ final class WP_Customize_Widgets {
 	 * Mapping of setting type to setting ID pattern.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $setting_id_patterns = array(
@@ -100,7 +93,6 @@ final class WP_Customize_Widgets {
 	 * Initial loader.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Manager $manager Customize manager bootstrap instance.
 	 */
@@ -143,7 +135,6 @@ final class WP_Customize_Widgets {
 	 * then this will always return an empty array.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @global WP_Widget_Factory $wp_widget_factory
 	 *
@@ -168,7 +159,6 @@ final class WP_Customize_Widgets {
 	 * Determines if a widget supports selective refresh.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $id_base Widget ID Base.
 	 * @return bool Whether the widget can be selective refreshed.
@@ -182,7 +172,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves the widget setting type given a setting ID.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @staticvar array $cache
 	 *
@@ -207,7 +196,6 @@ final class WP_Customize_Widgets {
 	 * them up-front so widgets will be initialized properly.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 */
 	public function register_settings() {
 		$widget_setting_ids = array();
@@ -239,7 +227,6 @@ final class WP_Customize_Widgets {
 	 * Determines the arguments for a dynamically-created setting.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param false|array $args       The arguments to the WP_Customize_Setting constructor.
 	 * @param string      $setting_id ID for dynamic setting, usually coming from `$_POST['customized']`.
@@ -256,7 +243,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves an unslashed post value or return a default.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @param string $name    Post value.
 	 * @param mixed  $default Default post value.
@@ -280,7 +266,6 @@ final class WP_Customize_Widgets {
 	 * theme gets switched.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $sidebars_widgets
 	 * @global array $_wp_sidebars_widgets
@@ -313,7 +298,6 @@ final class WP_Customize_Widgets {
 	 * theme_mod.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Widgets::handle_theme_switch()
 	 *
@@ -332,7 +316,6 @@ final class WP_Customize_Widgets {
 	 * option.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Widgets::handle_theme_switch()
 	 * @global array $sidebars_widgets
@@ -352,7 +335,6 @@ final class WP_Customize_Widgets {
 	 * Note: these actions are also fired in wp_ajax_update_widget().
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function customize_controls_init() {
 		/** This action is documented in wp-admin/includes/ajax-actions.php */
@@ -372,7 +354,6 @@ final class WP_Customize_Widgets {
 	 * so that all filters have been initialized (e.g. Widget Visibility).
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function schedule_customize_register() {
 		if ( is_admin() ) {
@@ -386,7 +367,6 @@ final class WP_Customize_Widgets {
 	 * Registers Customizer settings and controls for all sidebars and widgets.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 * @global array $wp_registered_widget_controls
@@ -537,7 +517,6 @@ final class WP_Customize_Widgets {
 	 * Determines whether the widgets panel is active, based on whether there are sidebars registered.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Panel::$active_callback
 	 *
@@ -553,7 +532,6 @@ final class WP_Customize_Widgets {
 	 * Converts a widget_id into its corresponding Customizer setting ID (option name).
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param string $widget_id Widget ID.
 	 * @return string Maybe-parsed widget ID.
@@ -579,7 +557,6 @@ final class WP_Customize_Widgets {
 	 * overridden with the {@see 'is_wide_widget_in_customizer'} filter.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global $wp_registered_widget_controls
 	 *
@@ -609,7 +586,6 @@ final class WP_Customize_Widgets {
 	 * Converts a widget ID into its id_base and number components.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param string $widget_id Widget ID.
 	 * @return array Array containing a widget's id_base and number components.
@@ -634,7 +610,6 @@ final class WP_Customize_Widgets {
 	 * Converts a widget setting ID (option path) to its id_base and number components.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param string $setting_id Widget setting ID.
 	 * @return WP_Error|array Array containing a widget's id_base and number components,
@@ -656,7 +631,6 @@ final class WP_Customize_Widgets {
 	 * allow custom styles from plugins.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function print_styles() {
 		/** This action is documented in wp-admin/admin-header.php */
@@ -671,7 +645,6 @@ final class WP_Customize_Widgets {
 	 * allow custom scripts from plugins.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function print_scripts() {
 		/** This action is documented in wp-admin/admin-header.php */
@@ -685,7 +658,6 @@ final class WP_Customize_Widgets {
 	 * Enqueues scripts and styles for Customizer panel and export data to JavaScript.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global WP_Scripts $wp_scripts
 	 * @global array $wp_registered_sidebars
@@ -822,7 +794,6 @@ final class WP_Customize_Widgets {
 	 * Renders the widget form control templates into the DOM.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function output_widget_control_templates() {
 		?>
@@ -865,7 +836,6 @@ final class WP_Customize_Widgets {
 	 * allow custom scripts from plugins.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function print_footer_scripts() {
 		/** This action is documented in wp-admin/admin-footer.php */
@@ -882,7 +852,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves common arguments to supply when constructing a Customizer setting.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param string $id        Widget setting ID.
 	 * @param array  $overrides Array of setting overrides.
@@ -926,7 +895,6 @@ final class WP_Customize_Widgets {
 	 * Used as the 'sanitize_callback' for each $sidebars_widgets setting.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $widget_ids Array of widget IDs.
 	 * @return array Array of sanitized widget IDs.
@@ -944,7 +912,6 @@ final class WP_Customize_Widgets {
 	 * Builds up an index of all available widgets for use in Backbone models.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 * @global array $wp_registered_widget_controls
@@ -1031,7 +998,6 @@ final class WP_Customize_Widgets {
 	 * Naturally orders available widgets by name.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @param array $widget_a The first widget to compare.
 	 * @param array $widget_b The second widget to compare.
@@ -1045,7 +1011,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves the widget control markup.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $args Widget control arguments.
 	 * @return string Widget control form HTML markup.
@@ -1065,7 +1030,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves the widget control markup parts.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $args Widget control arguments.
 	 * @return array {
@@ -1096,7 +1060,6 @@ final class WP_Customize_Widgets {
 	 * Adds hooks for the Customizer preview.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function customize_preview_init() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue' ) );
@@ -1108,7 +1071,6 @@ final class WP_Customize_Widgets {
 	 * Refreshes the nonce for widget updates.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param  array $nonces Array of nonces.
 	 * @return array $nonces Array of nonces.
@@ -1127,7 +1089,6 @@ final class WP_Customize_Widgets {
 	 * filter is added, it has to be reset after the filter has been added.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $sidebars_widgets List of widgets for the current sidebar.
 	 * @return array
@@ -1143,7 +1104,6 @@ final class WP_Customize_Widgets {
 	 * Enqueues scripts for the Customizer preview.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function customize_preview_enqueue() {
 		wp_enqueue_script( 'customize-preview-widgets' );
@@ -1154,7 +1114,6 @@ final class WP_Customize_Widgets {
 	 * stylesheet can override.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function print_preview_css() {
 		?>
@@ -1215,7 +1174,6 @@ final class WP_Customize_Widgets {
 	 * Tracks the widgets that were rendered.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $widget Rendered widget to tally.
 	 */
@@ -1227,7 +1185,6 @@ final class WP_Customize_Widgets {
 	 * Determine if a widget is rendered on the page.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $widget_id Widget ID to check.
 	 * @return bool Whether the widget is rendered.
@@ -1240,7 +1197,6 @@ final class WP_Customize_Widgets {
 	 * Determines if a sidebar is rendered on the page.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $sidebar_id Sidebar ID to check.
 	 * @return bool Whether the sidebar is rendered.
@@ -1257,7 +1213,6 @@ final class WP_Customize_Widgets {
 	 * if there were widgets populating it.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param bool   $is_active  Whether the sidebar is active.
 	 * @param string $sidebar_id Sidebar ID.
@@ -1283,7 +1238,6 @@ final class WP_Customize_Widgets {
 	 * there were widgets populating it.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param bool   $has_widgets Whether the current sidebar has widgets.
 	 * @param string $sidebar_id  Sidebar ID.
@@ -1309,7 +1263,6 @@ final class WP_Customize_Widgets {
 	 * data has occurred.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @param string $serialized_instance Widget instance.
 	 * @return string MAC for serialized widget instance.
@@ -1325,7 +1278,6 @@ final class WP_Customize_Widgets {
 	 * only get applied to an instance *once*.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $value Widget instance to sanitize.
 	 * @return array|void Sanitized widget instance.
@@ -1363,7 +1315,6 @@ final class WP_Customize_Widgets {
 	 * Converts a widget instance into JSON-representable format.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param array $value Widget instance to convert to JSON.
 	 * @return array JSON-converted widget instance.
@@ -1389,7 +1340,6 @@ final class WP_Customize_Widgets {
 	 * in a sidebar upon deactivation.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 *
@@ -1408,7 +1358,6 @@ final class WP_Customize_Widgets {
 	 * Requires that `$_POST` be populated with the instance data.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widget_updates
 	 * @global array $wp_registered_widget_controls
@@ -1538,7 +1487,6 @@ final class WP_Customize_Widgets {
 	 * Most code here copied from wp_ajax_save_widget().
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @see wp_ajax_save_widget()
 	 */
@@ -1601,7 +1549,6 @@ final class WP_Customize_Widgets {
 	 * Filters arguments for dynamic widget partials.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array|false $partial_args Partial arguments.
 	 * @param string      $partial_id   Partial ID.
@@ -1635,7 +1582,6 @@ final class WP_Customize_Widgets {
 	 * Adds hooks for selective refresh.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function selective_refresh_init() {
 		if ( ! current_theme_supports( 'customize-selective-refresh-widgets' ) ) {
@@ -1711,7 +1657,6 @@ final class WP_Customize_Widgets {
 	 * data-* attributes can be whitelisted.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $before_widget_tags_seen = array();
@@ -1722,7 +1667,6 @@ final class WP_Customize_Widgets {
 	 * This is needed in case the `$before_widget` is run through wp_kses() when printed.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array $allowed_html Allowed HTML.
 	 * @return array (Maybe) modified allowed HTML.
@@ -1752,7 +1696,6 @@ final class WP_Customize_Widgets {
 	 * This helps facilitate the uncommon scenario where a single sidebar is rendered multiple times on a template.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sidebar_instance_count = array();
@@ -1761,7 +1704,6 @@ final class WP_Customize_Widgets {
 	 * The current request's sidebar_instance_number context.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var int
 	 */
 	protected $context_sidebar_instance_number;
@@ -1770,7 +1712,6 @@ final class WP_Customize_Widgets {
 	 * Current sidebar ID being rendered.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $current_dynamic_sidebar_id_stack = array();
@@ -1781,7 +1722,6 @@ final class WP_Customize_Widgets {
 	 * Insert marker before widgets are rendered in a dynamic sidebar.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
@@ -1802,7 +1742,6 @@ final class WP_Customize_Widgets {
 	 * Inserts a marker after widgets are rendered in a dynamic sidebar.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param int|string $index Index, name, or ID of the dynamic sidebar.
 	 */
@@ -1817,7 +1756,6 @@ final class WP_Customize_Widgets {
 	 * Current sidebar being rendered.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $rendering_widget_id;
@@ -1826,7 +1764,6 @@ final class WP_Customize_Widgets {
 	 * Current widget being rendered.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $rendering_sidebar_id;
@@ -1835,7 +1772,6 @@ final class WP_Customize_Widgets {
 	 * Filters sidebars_widgets to ensure the currently-rendered widget is the only widget in the current sidebar.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 *
 	 * @param array $sidebars_widgets Sidebars widgets.
 	 * @return array Filtered sidebars widgets.
@@ -1849,7 +1785,6 @@ final class WP_Customize_Widgets {
 	 * Renders a specific widget using the supplied sidebar arguments.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @see dynamic_sidebar()
 	 *
@@ -1908,7 +1843,6 @@ final class WP_Customize_Widgets {
 	 * List of captured widget option updates.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array $_captured_options Values updated while option capture is happening.
 	 */
 	protected $_captured_options = array();
@@ -1917,7 +1851,6 @@ final class WP_Customize_Widgets {
 	 * Whether option capture is currently happening.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 * @var bool $_is_current Whether option capture is currently happening or not.
 	 */
 	protected $_is_capturing_option_updates = false;
@@ -1926,7 +1859,6 @@ final class WP_Customize_Widgets {
 	 * Determines whether the captured option update should be ignored.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @param string $option_name Option name.
 	 * @return bool Whether the option capture is ignored.
@@ -1939,7 +1871,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves captured widget option updates.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @return array Array of captured options.
 	 */
@@ -1951,7 +1882,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves the option that was captured from being saved.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $option_name Option name.
 	 * @param mixed  $default     Optional. Default value to return if the option does not exist. Default false.
@@ -1970,7 +1900,6 @@ final class WP_Customize_Widgets {
 	 * Retrieves the number of captured widget option updates.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 *
 	 * @return int Number of updated options.
 	 */
@@ -1982,7 +1911,6 @@ final class WP_Customize_Widgets {
 	 * Begins keeping track of changes to widget options, caching new values.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 */
 	protected function start_capturing_option_updates() {
 		if ( $this->_is_capturing_option_updates ) {
@@ -1998,7 +1926,6 @@ final class WP_Customize_Widgets {
 	 * Pre-filters captured option values before updating.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param mixed  $new_value   The new option value.
 	 * @param string $option_name Name of the option.
@@ -2023,7 +1950,6 @@ final class WP_Customize_Widgets {
 	 * Pre-filters captured option values before retrieving.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @param mixed $value Value to return instead of the option value.
 	 * @return mixed Filtered option value.
@@ -2045,7 +1971,6 @@ final class WP_Customize_Widgets {
 	 * Undoes any changes to the options since options capture began.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 */
 	protected function stop_capturing_option_updates() {
 		if ( ! $this->_is_capturing_option_updates ) {
diff --git a/wp-includes/class-wp-dependency.php b/wp-includes/class-wp-dependency.php
index 92c5456172..cd808e8ece 100644
--- a/wp-includes/class-wp-dependency.php
+++ b/wp-includes/class-wp-dependency.php
@@ -20,7 +20,6 @@ class _WP_Dependency {
 	/**
 	 * The handle name.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var null
 	 */
@@ -29,7 +28,6 @@ class _WP_Dependency {
 	/**
 	 * The handle source.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var null
 	 */
@@ -38,7 +36,6 @@ class _WP_Dependency {
 	/**
 	 * An array of handle dependencies.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var array
 	 */
@@ -49,7 +46,6 @@ class _WP_Dependency {
 	 *
 	 * Used for cache-busting.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var bool|string
 	 */
@@ -58,7 +54,6 @@ class _WP_Dependency {
 	/**
 	 * Additional arguments for the handle.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var null
 	 */
@@ -67,7 +62,6 @@ class _WP_Dependency {
 	/**
 	 * Extra data to supply to the handle.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var array
 	 */
@@ -87,7 +81,6 @@ class _WP_Dependency {
 	/**
 	 * Add handle data.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 *
 	 * @param string $name The data key to add.
diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index a8ce4d6c78..3ed15de46e 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -20,7 +20,6 @@ class WP_Embed {
 	 *
 	 * Bypasses the {@see 'embed_maybe_make_link'} filter.
 	 *
-	 * @access public
 	 * @var bool
 	 */
 	public $return_false_on_fail = false;
diff --git a/wp-includes/class-wp-error.php b/wp-includes/class-wp-error.php
index 8be6f33c25..2906e7661d 100644
--- a/wp-includes/class-wp-error.php
+++ b/wp-includes/class-wp-error.php
@@ -65,7 +65,6 @@ class WP_Error {
 	 * Retrieve all error codes.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @return array List of error codes, if available.
 	 */
@@ -80,7 +79,6 @@ class WP_Error {
 	 * Retrieve first error code available.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @return string|int Empty string, if no error codes.
 	 */
@@ -157,7 +155,6 @@ class WP_Error {
 	 * Add an error or append additional message to an existing error.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string|int $code Error code.
 	 * @param string $message Error message.
diff --git a/wp-includes/class-wp-feed-cache-transient.php b/wp-includes/class-wp-feed-cache-transient.php
index 1b5be4775a..dc929c8ac4 100644
--- a/wp-includes/class-wp-feed-cache-transient.php
+++ b/wp-includes/class-wp-feed-cache-transient.php
@@ -18,7 +18,6 @@ class WP_Feed_Cache_Transient {
 	 * Holds the transient name.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $name;
@@ -27,7 +26,6 @@ class WP_Feed_Cache_Transient {
 	 * Holds the transient mod name.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $mod_name;
@@ -38,7 +36,6 @@ class WP_Feed_Cache_Transient {
 	 * Defaults to 43200 seconds (12 hours).
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var int
 	 */
 	public $lifetime = 43200;
@@ -48,7 +45,6 @@ class WP_Feed_Cache_Transient {
 	 *
 	 * @since 2.8.0
 	 * @since 3.2.0 Updated to use a PHP5 constructor.
-	 * @access public
 	 *
 	 * @param string $location  URL location (scheme is used to determine handler).
 	 * @param string $filename  Unique identifier for cache object.
@@ -74,7 +70,6 @@ class WP_Feed_Cache_Transient {
 	 * Sets the transient.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param SimplePie $data Data to save.
 	 * @return true Always true.
@@ -93,7 +88,6 @@ class WP_Feed_Cache_Transient {
 	 * Gets the transient.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return mixed Transient value.
 	 */
@@ -105,7 +99,6 @@ class WP_Feed_Cache_Transient {
 	 * Gets mod transient.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return mixed Transient value.
 	 */
@@ -117,7 +110,6 @@ class WP_Feed_Cache_Transient {
 	 * Sets mod transient.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return bool False if value was not set and true if value was set.
 	 */
@@ -129,7 +121,6 @@ class WP_Feed_Cache_Transient {
 	 * Deletes transients.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return true Always true.
 	 */
diff --git a/wp-includes/class-wp-feed-cache.php b/wp-includes/class-wp-feed-cache.php
index 337d3f3e7c..1c7d2b263d 100644
--- a/wp-includes/class-wp-feed-cache.php
+++ b/wp-includes/class-wp-feed-cache.php
@@ -20,7 +20,6 @@ class WP_Feed_Cache extends SimplePie_Cache {
 	 * Creates a new SimplePie_Cache object.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param string $location  URL location (scheme is used to determine handler).
 	 * @param string $filename  Unique identifier for cache object.
diff --git a/wp-includes/class-wp-hook.php b/wp-includes/class-wp-hook.php
index a2b6ad991f..f70be1a251 100644
--- a/wp-includes/class-wp-hook.php
+++ b/wp-includes/class-wp-hook.php
@@ -21,7 +21,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Hook callbacks.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var array
 	 */
 	public $callbacks = array();
@@ -30,7 +29,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * The priority keys of actively running iterations of a hook.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $iterations = array();
@@ -39,7 +37,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * The current priority of actively running iterations of a hook.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $current_priority = array();
@@ -48,7 +45,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Number of levels this hook can be recursively called.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var int
 	 */
 	private $nesting_level = 0;
@@ -57,7 +53,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Flag for if we're current doing an action, rather than a filter.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var bool
 	 */
 	private $doing_action = false;
@@ -66,7 +61,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Hooks a function or method to a specific filter action.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string   $tag             The name of the filter to hook the $function_to_add callback to.
 	 * @param callable $function_to_add The callback to be run when the filter is applied.
@@ -99,7 +93,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Handles reseting callback priority keys mid-iteration.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param bool|int $new_priority     Optional. The priority of the new filter being added. Default false,
 	 *                                   for no priority being added.
@@ -168,7 +161,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Unhooks a function or method from a specific filter action.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string   $tag                The filter hook to which the function to be removed is hooked. Used
 	 *                                     for building the callback ID when SPL is not available.
@@ -196,7 +188,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Checks if a specific action has been registered for this hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param callable|bool $function_to_check Optional. The callback to check for. Default false.
 	 * @param string        $tag               Optional. The name of the filter hook. Used for building
@@ -226,7 +217,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Checks if any callbacks have been registered for this hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return bool True if callbacks have been registered for the current hook, otherwise false.
 	 */
@@ -243,7 +233,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Removes all callbacks from the current filter.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param int|bool $priority Optional. The priority number to remove. Default false.
 	 */
@@ -267,7 +256,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Calls the callback functions added to a filter hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param mixed $value The value to filter.
 	 * @param array $args  Arguments to pass to callbacks.
@@ -314,7 +302,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Executes the callback functions hooked on a specific action hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param mixed $args Arguments to pass to the hook callbacks.
 	 */
@@ -332,7 +319,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Processes the functions hooked into the 'all' hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $args Arguments to pass to the hook callbacks. Passed by reference.
 	 */
@@ -355,7 +341,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Return the current priority level of the currently running iteration of the hook.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return int|false If the hook is running, return the current priority level. If it isn't running, return false.
 	 */
@@ -371,7 +356,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Normalizes filters set up before WordPress has initialized to WP_Hook objects.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @static
 	 *
 	 * @param array $filters Filters to normalize.
@@ -405,7 +389,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Determines whether an offset value exists.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/arrayaccess.offsetexists.php
 	 *
@@ -420,7 +403,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Retrieves a value at a specified offset.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/arrayaccess.offsetget.php
 	 *
@@ -435,7 +417,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Sets a value at a specified offset.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/arrayaccess.offsetset.php
 	 *
@@ -454,7 +435,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Unsets a specified offset.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/arrayaccess.offsetunset.php
 	 *
@@ -468,7 +448,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Returns the current element.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/iterator.current.php
 	 *
@@ -482,7 +461,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Moves forward to the next element.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/iterator.next.php
 	 *
@@ -496,7 +474,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Returns the key of the current element.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/iterator.key.php
 	 *
@@ -510,7 +487,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Checks if current position is valid.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/iterator.valid.php
 	 *
@@ -524,7 +500,6 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * Rewinds the Iterator to the first element.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link https://secure.php.net/manual/en/iterator.rewind.php
 	 */
diff --git a/wp-includes/class-wp-http-cookie.php b/wp-includes/class-wp-http-cookie.php
index d2affc2cc1..6650e6eee2 100644
--- a/wp-includes/class-wp-http-cookie.php
+++ b/wp-includes/class-wp-http-cookie.php
@@ -67,7 +67,6 @@ class WP_Http_Cookie {
 	 * or a header string detailing it.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param string|array $data {
 	 *     Raw cookie data as header string or data array.
@@ -140,7 +139,6 @@ class WP_Http_Cookie {
 	 *
 	 * Decision is based on RFC 2109/2965, so look there for details on validity.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 *
 	 * @param string $url URL you intend to send this cookie to
@@ -185,7 +183,6 @@ class WP_Http_Cookie {
 	/**
 	 * Convert cookie name and value back to header string.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 *
 	 * @return string Header encoded cookie name and value.
@@ -208,7 +205,6 @@ class WP_Http_Cookie {
 	/**
 	 * Retrieve cookie header for usage in the rest of the WordPress HTTP API.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 *
 	 * @return string
@@ -221,7 +217,6 @@ class WP_Http_Cookie {
 	 * Retrieves cookie attributes.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return array {
 	 *    List of attributes.
diff --git a/wp-includes/class-wp-http-curl.php b/wp-includes/class-wp-http-curl.php
index 790e93cffb..e60cbce03a 100644
--- a/wp-includes/class-wp-http-curl.php
+++ b/wp-includes/class-wp-http-curl.php
@@ -22,7 +22,6 @@ class WP_Http_Curl {
 	 * Temporary header storage for during requests.
 	 *
 	 * @since 3.2.0
-	 * @access private
 	 * @var string
 	 */
 	private $headers = '';
@@ -31,7 +30,6 @@ class WP_Http_Curl {
 	 * Temporary body storage for during requests.
 	 *
 	 * @since 3.6.0
-	 * @access private
 	 * @var string
 	 */
 	private $body = '';
@@ -40,7 +38,6 @@ class WP_Http_Curl {
 	 * The maximum amount of data to receive from the remote server.
 	 *
 	 * @since 3.6.0
-	 * @access private
 	 * @var int
 	 */
 	private $max_body_length = false;
@@ -49,7 +46,6 @@ class WP_Http_Curl {
 	 * The file resource used for streaming to file.
 	 *
 	 * @since 3.6.0
-	 * @access private
 	 * @var resource
 	 */
 	private $stream_handle = false;
@@ -58,7 +54,6 @@ class WP_Http_Curl {
 	 * The total bytes written in the current request.
 	 *
 	 * @since 4.1.0
-	 * @access private
 	 * @var int
 	 */
 	private $bytes_written_total = 0;
@@ -66,7 +61,6 @@ class WP_Http_Curl {
 	/**
 	 * Send a HTTP request to a URI using cURL extension.
 	 *
-	 * @access public
 	 * @since 2.7.0
 	 *
 	 * @param string $url The request URL.
@@ -304,7 +298,6 @@ class WP_Http_Curl {
 	 * for temporary storage
 	 *
 	 * @since 3.2.0
-	 * @access private
 	 *
 	 * @param resource $handle  cURL handle.
 	 * @param string   $headers cURL request headers.
@@ -323,7 +316,6 @@ class WP_Http_Curl {
 	 * `$data` passed in will cause cURL to abort the request with `CURLE_WRITE_ERROR`.
 	 *
 	 * @since 3.6.0
-	 * @access private
 	 *
 	 * @param resource $handle  cURL handle.
 	 * @param string   $data    cURL request body.
diff --git a/wp-includes/class-wp-http-requests-response.php b/wp-includes/class-wp-http-requests-response.php
index 660831919e..630882ff87 100644
--- a/wp-includes/class-wp-http-requests-response.php
+++ b/wp-includes/class-wp-http-requests-response.php
@@ -19,7 +19,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Requests Response object.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var Requests_Response
 	 */
 	protected $response;
@@ -28,7 +27,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Filename the response was saved to.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var string|null
 	 */
 	protected $filename;
@@ -37,7 +35,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Constructor.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param Requests_Response $response HTTP response.
 	 * @param string            $filename Optional. File name. Default empty.
@@ -51,7 +48,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Retrieves the response object for the request.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return Requests_Response HTTP response.
 	 */
@@ -63,7 +59,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Retrieves headers associated with the response.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @see \Requests_Utility_CaseInsensitiveDictionary
 	 *
@@ -88,7 +83,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Sets all header values.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
@@ -100,7 +94,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Sets a single HTTP header.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key     Header name.
 	 * @param string $value   Header value.
@@ -119,7 +112,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Retrieves the HTTP return code for the response.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return int The 3-digit HTTP status code.
 	 */
@@ -131,7 +123,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Sets the 3-digit HTTP status code.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param int $code HTTP status.
 	 */
@@ -143,7 +134,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Retrieves the response data.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return mixed Response data.
 	 */
@@ -155,7 +145,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Sets the response data.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param mixed $data Response data.
 	 */
@@ -167,7 +156,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Retrieves cookies from the response.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return WP_HTTP_Cookie[] List of cookie objects.
 	 */
@@ -190,7 +178,6 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Converts the object to a WP_Http response array.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return array WP_Http response array, per WP_Http::request().
 	 */
diff --git a/wp-includes/class-wp-http-response.php b/wp-includes/class-wp-http-response.php
index da83de1d58..498af5fa7a 100644
--- a/wp-includes/class-wp-http-response.php
+++ b/wp-includes/class-wp-http-response.php
@@ -18,7 +18,6 @@ class WP_HTTP_Response {
 	 * Response data.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var mixed
 	 */
 	public $data;
@@ -27,7 +26,6 @@ class WP_HTTP_Response {
 	 * Response headers.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var array
 	 */
 	public $headers;
@@ -36,7 +34,6 @@ class WP_HTTP_Response {
 	 * Response status.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $status;
@@ -45,7 +42,6 @@ class WP_HTTP_Response {
 	 * Constructor.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param mixed $data    Response data. Default null.
 	 * @param int   $status  Optional. HTTP status code. Default 200.
@@ -61,7 +57,6 @@ class WP_HTTP_Response {
 	 * Retrieves headers associated with the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Map of header name to header value.
 	 */
@@ -73,7 +68,6 @@ class WP_HTTP_Response {
 	 * Sets all header values.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
@@ -85,7 +79,6 @@ class WP_HTTP_Response {
 	 * Sets a single HTTP header.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key     Header name.
 	 * @param string $value   Header value.
@@ -104,7 +97,6 @@ class WP_HTTP_Response {
 	 * Retrieves the HTTP return code for the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return int The 3-digit HTTP status code.
 	 */
@@ -116,7 +108,6 @@ class WP_HTTP_Response {
 	 * Sets the 3-digit HTTP status code.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param int $code HTTP status.
 	 */
@@ -128,7 +119,6 @@ class WP_HTTP_Response {
 	 * Retrieves the response data.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return mixed Response data.
 	 */
@@ -140,7 +130,6 @@ class WP_HTTP_Response {
 	 * Sets the response data.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param mixed $data Response data.
 	 */
@@ -155,7 +144,6 @@ class WP_HTTP_Response {
 	 * however this may be different if you want to do custom JSON data handling.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return mixed Any JSON-serializable value.
 	 */
diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php
index 2f10c67598..49cadbe194 100644
--- a/wp-includes/class-wp-http-streams.php
+++ b/wp-includes/class-wp-http-streams.php
@@ -22,7 +22,6 @@ class WP_Http_Streams {
 	 * @since 2.7.0
 	 * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
 	 *
-	 * @access public
 	 * @param string $url The request URL.
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
@@ -380,7 +379,6 @@ class WP_Http_Streams {
 	 * Determines whether this class can be used for retrieving a URL.
 	 *
 	 * @static
-	 * @access public
 	 * @since 2.7.0
 	 * @since 3.7.0 Combined with the fsockopen transport and switched to stream_socket_client().
 	 *
diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index 5208b33f1c..b39b4ebf77 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -17,7 +17,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	/**
 	 * GD Resource.
 	 *
-	 * @access protected
 	 * @var resource
 	 */
 	protected $image;
@@ -35,7 +34,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param array $args
 	 * @return bool
@@ -61,7 +59,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param string $mime_type
 	 * @return bool
@@ -84,7 +81,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Loads image from $this->file into new GD Resource.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
@@ -122,7 +118,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Sets or updates current image size.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param int $width
 	 * @param int $height
@@ -147,7 +142,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * maintain aspect ratio according to the provided dimension.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param  int|null $max_w Image width.
 	 * @param  int|null $max_h Image height.
@@ -200,7 +194,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Resize multiple images from a single source.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param array $sizes {
 	 *     An array of image size arrays. Default sizes are 'small', 'medium', 'medium_large', 'large'.
@@ -263,7 +256,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Crops Image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param int  $src_x   The start x position to crop from.
 	 * @param int  $src_y   The start y position to crop from.
@@ -309,7 +301,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Ported from image-edit.php
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param float $angle
 	 * @return true|WP_Error
@@ -335,7 +326,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Flips current image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param bool $horz Flip along Horizontal Axis
 	 * @param bool $vert Flip along Vertical Axis
@@ -365,7 +355,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Saves current in-memory image to file.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string|null $filename
 	 * @param string|null $mime_type
@@ -439,7 +428,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Returns stream of current image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $mime_type
 	 * @return bool
@@ -464,7 +452,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * Either calls editor's save function or handles file as a stream.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param string|stream $filename
 	 * @param callable $function
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 534b232319..2dbbf9e243 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -17,7 +17,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	/**
 	 * Imagick object.
 	 *
-	 * @access protected
 	 * @var Imagick
 	 */
 	protected $image;
@@ -39,7 +38,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param array $args
 	 * @return bool
@@ -98,7 +96,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param string $mime_type
 	 * @return bool
@@ -126,7 +123,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Loads image from $this->file into new Imagick Object.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
@@ -181,7 +177,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Sets Image Compression quality on a 1-100% scale.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
@@ -214,7 +209,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Sets or updates current image size.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param int $width
 	 * @param int $height
@@ -249,7 +243,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * maintain aspect ratio according to the provided dimension.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param  int|null $max_w Image width.
 	 * @param  int|null $max_h Image height.
@@ -285,7 +278,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * which resizes an image to given dimensions and removes any associated profiles.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 *
 	 * @param int    $dst_w       The destination width.
 	 * @param int    $dst_h       The destination height.
@@ -417,7 +409,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Resize multiple images from a single source.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param array $sizes {
 	 *     An array of image size arrays. Default sizes are 'small', 'medium', 'medium_large', 'large'.
@@ -488,7 +479,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Crops Image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param int  $src_x The start x position to crop from.
 	 * @param int  $src_y The start y position to crop from.
@@ -535,7 +525,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Rotates current image counter-clockwise by $angle.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param float $angle
 	 * @return true|WP_Error
@@ -570,7 +559,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Flips current image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param bool $horz Flip along Horizontal Axis
 	 * @param bool $vert Flip along Vertical Axis
@@ -594,7 +582,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Saves current image to file.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $destfilename
 	 * @param string $mime_type
@@ -664,7 +651,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Streams current image to browser.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $mime_type
 	 * @return true|WP_Error
@@ -694,7 +680,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Strips all image meta except color profiles from an image.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 *
 	 * @return true|WP_Error True if stripping metadata was successful. WP_Error object on error.
 	 */
@@ -747,7 +732,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * Increases rendering DPI and only loads first page.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string|WP_Error File to load or WP_Error on failure.
 	 */
diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index ddf3cb30bd..d7646ccaca 100644
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -35,7 +35,6 @@ abstract class WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 * @abstract
 	 *
 	 * @param array $args
@@ -52,7 +51,6 @@ abstract class WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access public
 	 * @abstract
 	 *
 	 * @param string $mime_type
@@ -66,7 +64,6 @@ abstract class WP_Image_Editor {
 	 * Loads image from $this->file into editor.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @return bool|WP_Error True if loaded; WP_Error on failure.
@@ -77,7 +74,6 @@ abstract class WP_Image_Editor {
 	 * Saves current image to file.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param string $destfilename
@@ -94,7 +90,6 @@ abstract class WP_Image_Editor {
 	 * maintain aspect ratio according to the provided dimension.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param  int|null $max_w Image width.
@@ -108,7 +103,6 @@ abstract class WP_Image_Editor {
 	 * Resize multiple images from a single source.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param array $sizes {
@@ -128,7 +122,6 @@ abstract class WP_Image_Editor {
 	 * Crops Image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param int $src_x The start x position to crop from.
@@ -146,7 +139,6 @@ abstract class WP_Image_Editor {
 	 * Rotates current image counter-clockwise by $angle.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param float $angle
@@ -158,7 +150,6 @@ abstract class WP_Image_Editor {
 	 * Flips current image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param bool $horz Flip along Horizontal Axis
@@ -171,7 +162,6 @@ abstract class WP_Image_Editor {
 	 * Streams current image to browser.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @abstract
 	 *
 	 * @param string $mime_type
@@ -183,7 +173,6 @@ abstract class WP_Image_Editor {
 	 * Gets dimensions of image.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @return array {'width'=>int, 'height'=>int}
 	 */
@@ -195,7 +184,6 @@ abstract class WP_Image_Editor {
 	 * Sets current image size.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param int $width
 	 * @param int $height
@@ -213,7 +201,6 @@ abstract class WP_Image_Editor {
 	 * Gets the Image Compression quality on a 1-100% scale.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @return int $quality Compression Quality. Range: [1,100]
 	 */
@@ -229,7 +216,6 @@ abstract class WP_Image_Editor {
 	 * Sets Image Compression quality on a 1-100% scale.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
@@ -298,7 +284,6 @@ abstract class WP_Image_Editor {
 	 * Provides corrected filename only if filename is provided.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param string $filename
 	 * @param string $mime_type
@@ -359,7 +344,6 @@ abstract class WP_Image_Editor {
 	 * Builds an output filename based on current file, and adding proper suffix
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $suffix
 	 * @param string $dest_path
@@ -387,7 +371,6 @@ abstract class WP_Image_Editor {
 	 * Builds and returns proper suffix for file based on height and width.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @return false|string suffix
 	 */
@@ -402,7 +385,6 @@ abstract class WP_Image_Editor {
 	 * Either calls editor's save function or handles file as a stream.
 	 *
 	 * @since 3.5.0
-	 * @access protected
 	 *
 	 * @param string|stream $filename
 	 * @param callable $function
@@ -445,7 +427,6 @@ abstract class WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access protected
 	 *
 	 * @param string $extension
 	 * @return string|false
@@ -473,7 +454,6 @@ abstract class WP_Image_Editor {
 	 * @since 3.5.0
 	 *
 	 * @static
-	 * @access protected
 	 *
 	 * @param string $mime_type
 	 * @return string|false
diff --git a/wp-includes/class-wp-list-util.php b/wp-includes/class-wp-list-util.php
index 4af814d555..4066e96364 100644
--- a/wp-includes/class-wp-list-util.php
+++ b/wp-includes/class-wp-list-util.php
@@ -18,7 +18,6 @@ class WP_List_Util {
 	 * The input array.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $input = array();
@@ -27,7 +26,6 @@ class WP_List_Util {
 	 * The output array.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $output = array();
@@ -36,7 +34,6 @@ class WP_List_Util {
 	 * Temporary arguments for sorting.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array
 	 */
 	private $orderby = array();
@@ -58,7 +55,6 @@ class WP_List_Util {
 	 * Returns the original input array.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array The input array.
 	 */
@@ -70,7 +66,6 @@ class WP_List_Util {
 	 * Returns the output array.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array The output array.
 	 */
@@ -228,7 +223,6 @@ class WP_List_Util {
 	 * Callback to sort the list by specific fields.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @see WP_List_Util::sort()
 	 *
diff --git a/wp-includes/class-wp-locale-switcher.php b/wp-includes/class-wp-locale-switcher.php
index 2b0638d291..b254be3a90 100644
--- a/wp-includes/class-wp-locale-switcher.php
+++ b/wp-includes/class-wp-locale-switcher.php
@@ -17,7 +17,6 @@ class WP_Locale_Switcher {
 	 * Locale stack.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var string[]
 	 */
 	private $locales = array();
@@ -26,7 +25,6 @@ class WP_Locale_Switcher {
 	 * Original locale.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var string
 	 */
 	private $original_locale;
@@ -35,7 +33,6 @@ class WP_Locale_Switcher {
 	 * Holds all available languages.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var array An array of language codes (file names without the .mo extension).
 	 */
 	private $available_languages = array();
@@ -184,7 +181,6 @@ class WP_Locale_Switcher {
 	 * When switching to a locale, translations for this locale must be loaded from scratch.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @global Mo[] $l10n An array of all currently loaded text domains.
 	 *
@@ -214,7 +210,6 @@ class WP_Locale_Switcher {
 	 * all post type labels.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @global WP_Locale $wp_locale The WordPress date and time locale object.
 	 *
diff --git a/wp-includes/class-wp-locale.php b/wp-includes/class-wp-locale.php
index 82c4953a8f..748e54f0e6 100644
--- a/wp-includes/class-wp-locale.php
+++ b/wp-includes/class-wp-locale.php
@@ -99,7 +99,6 @@ class WP_Locale {
 	 * The thousands separator and decimal point values used for localizing numbers.
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var array
 	 */
 	public $number_format;
@@ -122,7 +121,6 @@ class WP_Locale {
 	 * specific calendar names and text direction.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @global string $text_direction
 	 */
@@ -240,7 +238,6 @@ class WP_Locale {
 	 * Outputs an admin notice if the /build directory must be used for RTL.
 	 *
 	 * @since 3.8.0
-	 * @access public
 	 */
 	public function rtl_src_admin_notice() {
 		/* translators: %s: Name of the directory (build) */
@@ -255,7 +252,6 @@ class WP_Locale {
 	 * and ends on Saturday with is fetched by using 6 (six).
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param int $weekday_number 0 for Sunday through 6 Saturday
 	 * @return string Full translated weekday
@@ -273,7 +269,6 @@ class WP_Locale {
 	 * not conflict.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $weekday_name
 	 * @return string
@@ -289,7 +284,6 @@ class WP_Locale {
 	 * full weekday word.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $weekday_name Full translated weekday word
 	 * @return string Translated weekday abbreviation
@@ -310,7 +304,6 @@ class WP_Locale {
 	 * '0' before the numbers less than 10 for you.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string|int $month_number '01' through '12'
 	 * @return string Translated full month name
@@ -326,7 +319,6 @@ class WP_Locale {
 	 * translatable version of the month.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $month_name Translated month to get abbreviated version
 	 * @return string Translated abbreviated month
@@ -341,7 +333,6 @@ class WP_Locale {
 	 * The $meridiem parameter is expected to not be translated.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $meridiem Either 'am', 'pm', 'AM', or 'PM'. Not translated version.
 	 * @return string Translated version
@@ -356,7 +347,6 @@ class WP_Locale {
 	 * For backward compatibility only.
 	 *
 	 * @deprecated For backward compatibility only.
-	 * @access public
 	 *
 	 * @global array $weekday
 	 * @global array $weekday_initial
diff --git a/wp-includes/class-wp-matchesmapregex.php b/wp-includes/class-wp-matchesmapregex.php
index 86ebb2524a..455778327b 100644
--- a/wp-includes/class-wp-matchesmapregex.php
+++ b/wp-includes/class-wp-matchesmapregex.php
@@ -15,7 +15,6 @@ class WP_MatchesMapRegex {
 	/**
 	 * store for matches
 	 *
-	 * @access private
 	 * @var array
 	 */
 	private $_matches;
@@ -23,7 +22,6 @@ class WP_MatchesMapRegex {
 	/**
 	 * store for mapping result
 	 *
-	 * @access public
 	 * @var string
 	 */
 	public $output;
@@ -31,7 +29,6 @@ class WP_MatchesMapRegex {
 	/**
 	 * subject to perform mapping on (query string containing $matches[] references
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $_subject;
@@ -61,7 +58,6 @@ class WP_MatchesMapRegex {
 	 * static helper function to ease use
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param string $subject subject
 	 * @param array  $matches data used for substitution
@@ -75,7 +71,6 @@ class WP_MatchesMapRegex {
 	/**
 	 * do the actual mapping
 	 *
-	 * @access private
 	 * @return string
 	 */
 	private function _map() {
@@ -86,7 +81,6 @@ class WP_MatchesMapRegex {
 	/**
 	 * preg_replace_callback hook
 	 *
-	 * @access public
 	 * @param  array $matches preg_replace regexp matches
 	 * @return string
 	 */
diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
index be3fcf143e..3fb7956da4 100644
--- a/wp-includes/class-wp-meta-query.php
+++ b/wp-includes/class-wp-meta-query.php
@@ -26,7 +26,6 @@ class WP_Meta_Query {
 	 * See WP_Meta_Query::__construct() for information on meta query arguments.
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 * @var array
 	 */
 	public $queries = array();
@@ -35,7 +34,6 @@ class WP_Meta_Query {
 	 * The relation between the queries. Can be one of 'AND' or 'OR'.
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $relation;
@@ -44,7 +42,6 @@ class WP_Meta_Query {
 	 * Database table to query for the metadata.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $meta_table;
@@ -53,7 +50,6 @@ class WP_Meta_Query {
 	 * Column in meta_table that represents the ID of the object the metadata belongs to.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $meta_id_column;
@@ -62,7 +58,6 @@ class WP_Meta_Query {
 	 * Database table that where the metadata's objects are stored (eg $wpdb->users).
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $primary_table;
@@ -71,7 +66,6 @@ class WP_Meta_Query {
 	 * Column in primary_table that represents the ID of the object.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $primary_id_column;
@@ -80,7 +74,6 @@ class WP_Meta_Query {
 	 * A flat list of table aliases used in JOIN clauses.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $table_aliases = array();
@@ -89,7 +82,6 @@ class WP_Meta_Query {
 	 * A flat list of clauses, keyed by clause 'name'.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $clauses = array();
@@ -98,7 +90,6 @@ class WP_Meta_Query {
 	 * Whether the query contains any OR relations.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $has_or_relation = false;
@@ -109,7 +100,6 @@ class WP_Meta_Query {
 	 * @since 3.2.0
 	 * @since 4.2.0 Introduced support for naming query clauses by associative array keys.
 	 *
-	 * @access public
 	 *
 	 * @param array $meta_query {
 	 *     Array of meta query clauses. When first-order clauses or sub-clauses use strings as
@@ -153,7 +143,6 @@ class WP_Meta_Query {
 	 * Eliminates empty items and ensures that a 'relation' is set.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @param array $queries Array of query clauses.
 	 * @return array Sanitized array of query clauses.
@@ -222,7 +211,6 @@ class WP_Meta_Query {
 	 * a 'value' array key.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param array $query Meta query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
@@ -235,7 +223,6 @@ class WP_Meta_Query {
 	 * Constructs a meta query based on 'meta_*' query vars
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 *
 	 * @param array $qv The query variables
 	 */
@@ -283,7 +270,6 @@ class WP_Meta_Query {
 	 * Return the appropriate alias for the given meta type if applicable.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param string $type MySQL type to cast meta_value.
 	 * @return string MySQL type.
@@ -307,7 +293,6 @@ class WP_Meta_Query {
 	 * Generates SQL clauses to be appended to a main query.
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 *
 	 * @param string $type              Type of meta, eg 'user', 'post'.
 	 * @param string $primary_table     Database table where the object being filtered is stored (eg wp_users).
@@ -365,7 +350,6 @@ class WP_Meta_Query {
 	 * out to maintain parity with the other Query classes.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query.
@@ -396,7 +380,6 @@ class WP_Meta_Query {
 	 * produce the properly nested SQL.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param array $query Query to parse, passed by reference.
 	 * @param int   $depth Optional. Number of tree levels deep we currently are.
@@ -480,7 +463,6 @@ class WP_Meta_Query {
 	 * "First-order" means that it's an array with a 'key' or 'value'.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -658,7 +640,6 @@ class WP_Meta_Query {
 	 * a value of 'orderby' corresponding to a meta clause.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @return array Meta clauses.
 	 */
@@ -681,7 +662,6 @@ class WP_Meta_Query {
 	 * connected by the relation 'OR'.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param  array       $clause       Query clause.
 	 * @param  array       $parent_query Parent query of $clause.
diff --git a/wp-includes/class-wp-metadata-lazyloader.php b/wp-includes/class-wp-metadata-lazyloader.php
index beaf249f4e..284bfb9e8a 100644
--- a/wp-includes/class-wp-metadata-lazyloader.php
+++ b/wp-includes/class-wp-metadata-lazyloader.php
@@ -33,7 +33,6 @@ class WP_Metadata_Lazyloader {
 	 * Pending objects queue.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $pending_objects;
@@ -42,7 +41,6 @@ class WP_Metadata_Lazyloader {
 	 * Settings for supported object types.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $settings = array();
@@ -51,7 +49,6 @@ class WP_Metadata_Lazyloader {
 	 * Constructor.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->settings = array(
@@ -70,7 +67,6 @@ class WP_Metadata_Lazyloader {
 	 * Adds objects to the metadata lazy-load queue.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $object_type Type of object whose meta is to be lazy-loaded. Accepts 'term' or 'comment'.
 	 * @param array  $object_ids  Array of object IDs.
@@ -112,7 +108,6 @@ class WP_Metadata_Lazyloader {
 	 * Resets lazy-load queue for a given object type.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $object_type Object type. Accepts 'comment' or 'term'.
 	 * @return bool|WP_Error True on success, WP_Error on failure.
@@ -135,7 +130,6 @@ class WP_Metadata_Lazyloader {
 	 * is no need to invoke it directly.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param mixed $check The `$check` param passed from the 'get_term_metadata' hook.
 	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
diff --git a/wp-includes/class-wp-network-query.php b/wp-includes/class-wp-network-query.php
index 646491fbec..3d26f51ca2 100644
--- a/wp-includes/class-wp-network-query.php
+++ b/wp-includes/class-wp-network-query.php
@@ -20,7 +20,6 @@ class WP_Network_Query {
 	 * SQL for database query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -29,7 +28,6 @@ class WP_Network_Query {
 	 * SQL query clauses.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sql_clauses = array(
@@ -45,7 +43,6 @@ class WP_Network_Query {
 	 * Query vars set by the user.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars;
@@ -54,7 +51,6 @@ class WP_Network_Query {
 	 * Default values for query vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_var_defaults;
@@ -63,7 +59,6 @@ class WP_Network_Query {
 	 * List of networks located by the query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $networks;
@@ -72,7 +67,6 @@ class WP_Network_Query {
 	 * The amount of found networks for the current query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var int
 	 */
 	public $found_networks = 0;
@@ -81,7 +75,6 @@ class WP_Network_Query {
 	 * The number of pages.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var int
 	 */
 	public $max_num_pages = 0;
@@ -92,7 +85,6 @@ class WP_Network_Query {
 	 * Sets up the network query, based on the query vars passed.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or query string of network query parameters. Default empty.
@@ -152,7 +144,6 @@ class WP_Network_Query {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @access public
 	 *
 	 * @param string|array $query WP_Network_Query arguments. See WP_Network_Query::__construct()
 	 */
@@ -177,7 +168,6 @@ class WP_Network_Query {
 	 * Sets up the WordPress query for retrieving networks.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of networks, or number of networks when 'count' is passed as a query var.
@@ -191,7 +181,6 @@ class WP_Network_Query {
 	 * Gets a list of networks matching the query vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return int|array The list of networks.
 	 */
@@ -284,7 +273,6 @@ class WP_Network_Query {
 	 * Used internally to get a list of network IDs matching the query vars.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -461,7 +449,6 @@ class WP_Network_Query {
 	 * if the limit clause was used.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -487,7 +474,6 @@ class WP_Network_Query {
 	 * Used internally to generate an SQL string for searching across multiple columns.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb  $wpdb WordPress database abstraction object.
 	 *
@@ -513,7 +499,6 @@ class WP_Network_Query {
 	 * Parses and sanitizes 'orderby' keys passed to the network query.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -547,7 +532,6 @@ class WP_Network_Query {
 	 * Parses an 'order' query variable and cast it to 'ASC' or 'DESC' as necessary.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
diff --git a/wp-includes/class-wp-network.php b/wp-includes/class-wp-network.php
index 7ba03d86b1..36d8e63dba 100644
--- a/wp-includes/class-wp-network.php
+++ b/wp-includes/class-wp-network.php
@@ -30,7 +30,6 @@ class WP_Network {
 	 * @since 4.6.0 Converted from public to private to explicitly enable more intuitive
 	 *              access via magic methods. As part of the access change, the type was
 	 *              also changed from `string` to `int`.
-	 * @access private
 	 * @var int
 	 */
 	private $id;
@@ -39,7 +38,6 @@ class WP_Network {
 	 * Domain of the network.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $domain = '';
@@ -48,7 +46,6 @@ class WP_Network {
 	 * Path of the network.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $path = '';
@@ -62,7 +59,6 @@ class WP_Network {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.4.0
-	 * @access private
 	 * @var string
 	 */
 	private $blog_id = '0';
@@ -71,7 +67,6 @@ class WP_Network {
 	 * Domain used to set cookies for this network.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $cookie_domain = '';
@@ -82,7 +77,6 @@ class WP_Network {
 	 * Named "site" vs. "network" for legacy reasons.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $site_name = '';
@@ -91,7 +85,6 @@ class WP_Network {
 	 * Retrieve a network from the database by its ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -128,7 +121,6 @@ class WP_Network {
 	 * default properties based on that information.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_Network|object $network A network object.
 	 */
@@ -147,7 +139,6 @@ class WP_Network {
 	 * Allows current multisite naming conventions when getting properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key Property to get.
 	 * @return mixed Value of the property. Null if not available.
@@ -171,7 +162,6 @@ class WP_Network {
 	 * Allows current multisite naming conventions when checking for properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key Property to check if set.
 	 * @return bool Whether the property is set.
@@ -193,7 +183,6 @@ class WP_Network {
 	 * Allows current multisite naming conventions while setting properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key   Property to set.
 	 * @param mixed  $value Value to assign to the property.
@@ -216,7 +205,6 @@ class WP_Network {
 	 * Set the site name assigned to the network if one has not been populated.
 	 *
 	 * @since 4.4.0
-	 * @access private
 	 */
 	private function _set_site_name() {
 		if ( ! empty( $this->site_name ) ) {
@@ -234,7 +222,6 @@ class WP_Network {
 	 * @todo What if the domain of the network doesn't match the current site?
 	 *
 	 * @since 4.4.0
-	 * @access private
 	 */
 	private function _set_cookie_domain() {
 		if ( ! empty( $this->cookie_domain ) ) {
@@ -258,7 +245,6 @@ class WP_Network {
 	 * requested site address.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string   $domain   Domain to check.
diff --git a/wp-includes/class-wp-oembed-controller.php b/wp-includes/class-wp-oembed-controller.php
index 63cc1842ed..7ee7950b07 100644
--- a/wp-includes/class-wp-oembed-controller.php
+++ b/wp-includes/class-wp-oembed-controller.php
@@ -20,7 +20,6 @@ final class WP_oEmbed_Controller {
 	 * Register the oEmbed REST API route.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 */
 	public function register_routes() {
 		/**
@@ -101,7 +100,6 @@ final class WP_oEmbed_Controller {
 	 * Returns the JSON object for the post.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|array oEmbed response data or WP_Error on failure.
@@ -132,7 +130,6 @@ final class WP_oEmbed_Controller {
 	 * Checks if current user can make a proxy oEmbed request.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
@@ -149,7 +146,6 @@ final class WP_oEmbed_Controller {
 	 * Returns the JSON object for the proxied item.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @see WP_oEmbed::get_html()
 	 * @param WP_REST_Request $request Full data about the request.
diff --git a/wp-includes/class-wp-post-type.php b/wp-includes/class-wp-post-type.php
index 69b9834db1..ba37a02fb5 100644
--- a/wp-includes/class-wp-post-type.php
+++ b/wp-includes/class-wp-post-type.php
@@ -19,7 +19,6 @@ final class WP_Post_Type {
 	 * Post type key.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $name
 	 */
 	public $name;
@@ -28,7 +27,6 @@ final class WP_Post_Type {
 	 * Name of the post type shown in the menu. Usually plural.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $label
 	 */
 	public $label;
@@ -42,7 +40,6 @@ final class WP_Post_Type {
 	 * @see get_post_type_labels()
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var object $labels
 	 */
 	public $labels;
@@ -53,7 +50,6 @@ final class WP_Post_Type {
 	 * Default empty.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $description
 	 */
 	public $description = '';
@@ -67,7 +63,6 @@ final class WP_Post_Type {
 	 * Default false.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $public
 	 */
 	public $public = false;
@@ -78,7 +73,6 @@ final class WP_Post_Type {
 	 * Default false.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $hierarchical
 	 */
 	public $hierarchical = false;
@@ -90,7 +84,6 @@ final class WP_Post_Type {
 	 * Default is the opposite value of $public.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $exclude_from_search
 	 */
 	public $exclude_from_search = null;
@@ -106,7 +99,6 @@ final class WP_Post_Type {
 	 * Default is the value of $public.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $publicly_queryable
 	 */
 	public $publicly_queryable = null;
@@ -117,7 +109,6 @@ final class WP_Post_Type {
 	 * Default is the value of $public.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $show_ui
 	 */
 	public $show_ui = null;
@@ -132,7 +123,6 @@ final class WP_Post_Type {
 	 * Default is the value of $show_ui.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $show_in_menu
 	 */
 	public $show_in_menu = null;
@@ -143,7 +133,6 @@ final class WP_Post_Type {
 	 * Default is the value $public.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $show_in_nav_menus
 	 */
 	public $show_in_nav_menus = null;
@@ -154,7 +143,6 @@ final class WP_Post_Type {
 	 * Default is the value of $show_in_menu.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $show_in_admin_bar
 	 */
 	public $show_in_admin_bar = null;
@@ -165,7 +153,6 @@ final class WP_Post_Type {
 	 * To work, $show_in_menu must be true. Default null (at the bottom).
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var int $menu_position
 	 */
 	public $menu_position = null;
@@ -181,7 +168,6 @@ final class WP_Post_Type {
 	 * Defaults to use the posts icon.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $menu_icon
 	 */
 	public $menu_icon = null;
@@ -194,7 +180,6 @@ final class WP_Post_Type {
 	 * array( 'story', 'stories' ). Default 'post'.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $capability_type
 	 */
 	public $capability_type = 'post';
@@ -205,7 +190,6 @@ final class WP_Post_Type {
 	 * Default false.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $map_meta_cap
 	 */
 	public $map_meta_cap = false;
@@ -216,7 +200,6 @@ final class WP_Post_Type {
 	 * Do `remove_meta_box()` and `add_meta_box()` calls in the callback. Default null.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $register_meta_box_cb
 	 */
 	public $register_meta_box_cb = null;
@@ -229,7 +212,6 @@ final class WP_Post_Type {
 	 * Default empty array.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array $taxonomies
 	 */
 	public $taxonomies = array();
@@ -240,7 +222,6 @@ final class WP_Post_Type {
 	 * Will generate the proper rewrite rules if $rewrite is enabled. Default false.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool|string $has_archive
 	 */
 	public $has_archive = false;
@@ -252,7 +233,6 @@ final class WP_Post_Type {
 	 * If specified as a string, the query `?{query_var_string}={post_slug}` will be valid.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string|bool $query_var
 	 */
 	public $query_var;
@@ -263,7 +243,6 @@ final class WP_Post_Type {
 	 * Default true.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $can_export
 	 */
 	public $can_export = true;
@@ -277,7 +256,6 @@ final class WP_Post_Type {
 	 * Otherwise posts are not trashed or deleted. Default null.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $delete_with_user
 	 */
 	public $delete_with_user = null;
@@ -288,7 +266,6 @@ final class WP_Post_Type {
 	 * Default false.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var bool $_builtin
 	 */
 	public $_builtin = false;
@@ -299,7 +276,6 @@ final class WP_Post_Type {
 	 * Default 'post.php?post=%d'.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string $_edit_link
 	 */
 	public $_edit_link = 'post.php?post=%d';
@@ -308,7 +284,6 @@ final class WP_Post_Type {
 	 * Post type capabilities.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var object $cap
 	 */
 	public $cap;
@@ -319,7 +294,6 @@ final class WP_Post_Type {
 	 * Defaults to true, using $post_type as slug.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array|false $rewrite
 	 */
 	public $rewrite;
@@ -328,7 +302,6 @@ final class WP_Post_Type {
 	 * The features supported by the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array|bool $supports
 	 */
 	public $supports;
@@ -340,7 +313,6 @@ final class WP_Post_Type {
 	 * respect to $rest_base and $rest_controller_class.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var bool $show_in_rest
 	 */
 	public $show_in_rest;
@@ -349,7 +321,6 @@ final class WP_Post_Type {
 	 * The base path for this post type's REST API endpoints.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var string|bool $rest_base
 	 */
 	public $rest_base;
@@ -360,7 +331,6 @@ final class WP_Post_Type {
 	 * Custom controllers must extend WP_REST_Controller.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var string|bool $rest_controller_class
 	 */
 	public $rest_controller_class;
@@ -372,7 +342,6 @@ final class WP_Post_Type {
 	 * default properties based on that information.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @see register_post_type()
 	 *
@@ -390,7 +359,6 @@ final class WP_Post_Type {
 	 * Sets post type properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param array|string $args Array or string of arguments for registering a post type.
 	 */
@@ -542,7 +510,6 @@ final class WP_Post_Type {
 	 * Sets the features support for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function add_supports() {
 		if ( ! empty( $this->supports ) ) {
@@ -558,7 +525,6 @@ final class WP_Post_Type {
 	 * Adds the necessary rewrite rules for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @global WP_Rewrite $wp_rewrite WordPress Rewrite Component.
 	 * @global WP         $wp         Current WordPress environment instance.
@@ -606,7 +572,6 @@ final class WP_Post_Type {
 	 * Registers the post type meta box if a custom callback was specified.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function register_meta_boxes() {
 		if ( $this->register_meta_box_cb ) {
@@ -618,7 +583,6 @@ final class WP_Post_Type {
 	 * Adds the future post hook action for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function add_hooks() {
 		add_action( 'future_' . $this->name, '_future_post_hook', 5, 2 );
@@ -628,7 +592,6 @@ final class WP_Post_Type {
 	 * Registers the taxonomies for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function register_taxonomies() {
 		foreach ( $this->taxonomies as $taxonomy ) {
@@ -640,7 +603,6 @@ final class WP_Post_Type {
 	 * Removes the features support for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @global array $_wp_post_type_features Post type features.
 	 */
@@ -654,7 +616,6 @@ final class WP_Post_Type {
 	 * Removes any rewrite rules, permastructs, and rules for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @global WP_Rewrite $wp_rewrite          WordPress rewrite component.
 	 * @global WP         $wp                  Current WordPress environment instance.
@@ -689,7 +650,6 @@ final class WP_Post_Type {
 	 * Unregisters the post type meta box if a custom callback was specified.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function unregister_meta_boxes() {
 		if ( $this->register_meta_box_cb ) {
@@ -701,7 +661,6 @@ final class WP_Post_Type {
 	 * Removes the post type from all taxonomies.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function unregister_taxonomies() {
 		foreach ( get_object_taxonomies( $this->name ) as $taxonomy ) {
@@ -713,7 +672,6 @@ final class WP_Post_Type {
 	 * Removes the future post hook action for the post type.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 */
 	public function remove_hooks() {
 		remove_action( 'future_' . $this->name, '_future_post_hook', 5 );
diff --git a/wp-includes/class-wp-post.php b/wp-includes/class-wp-post.php
index c9ec711606..1b05a738bc 100644
--- a/wp-includes/class-wp-post.php
+++ b/wp-includes/class-wp-post.php
@@ -25,7 +25,6 @@ final class WP_Post {
 	 * Post ID.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $ID;
@@ -36,7 +35,6 @@ final class WP_Post {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_author = 0;
@@ -45,7 +43,6 @@ final class WP_Post {
 	 * The post's local publication time.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_date = '0000-00-00 00:00:00';
@@ -54,7 +51,6 @@ final class WP_Post {
 	 * The post's GMT publication time.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_date_gmt = '0000-00-00 00:00:00';
@@ -63,7 +59,6 @@ final class WP_Post {
 	 * The post's content.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_content = '';
@@ -72,7 +67,6 @@ final class WP_Post {
 	 * The post's title.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_title = '';
@@ -81,7 +75,6 @@ final class WP_Post {
 	 * The post's excerpt.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_excerpt = '';
@@ -90,7 +83,6 @@ final class WP_Post {
 	 * The post's status.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_status = 'publish';
@@ -99,7 +91,6 @@ final class WP_Post {
 	 * Whether comments are allowed.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_status = 'open';
@@ -108,7 +99,6 @@ final class WP_Post {
 	 * Whether pings are allowed.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $ping_status = 'open';
@@ -117,7 +107,6 @@ final class WP_Post {
 	 * The post's password in plain text.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_password = '';
@@ -126,7 +115,6 @@ final class WP_Post {
 	 * The post's slug.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_name = '';
@@ -135,7 +123,6 @@ final class WP_Post {
 	 * URLs queued to be pinged.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $to_ping = '';
@@ -144,7 +131,6 @@ final class WP_Post {
 	 * URLs that have been pinged.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $pinged = '';
@@ -153,7 +139,6 @@ final class WP_Post {
 	 * The post's local modified time.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_modified = '0000-00-00 00:00:00';
@@ -162,7 +147,6 @@ final class WP_Post {
 	 * The post's GMT modified time.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_modified_gmt = '0000-00-00 00:00:00';
@@ -171,7 +155,6 @@ final class WP_Post {
 	 * A utility DB field for post content.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_content_filtered = '';
@@ -180,7 +163,6 @@ final class WP_Post {
 	 * ID of a post's parent post.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $post_parent = 0;
@@ -189,7 +171,6 @@ final class WP_Post {
 	 * The unique identifier for a post, not necessarily a URL, used as the feed GUID.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $guid = '';
@@ -198,7 +179,6 @@ final class WP_Post {
 	 * A field used for ordering posts.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $menu_order = 0;
@@ -207,7 +187,6 @@ final class WP_Post {
 	 * The post's type, like post or page.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_type = 'post';
@@ -216,7 +195,6 @@ final class WP_Post {
 	 * An attachment's mime type.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $post_mime_type = '';
@@ -227,7 +205,6 @@ final class WP_Post {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $comment_count = 0;
@@ -238,7 +215,6 @@ final class WP_Post {
 	 * Does not correspond to a DB field.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $filter;
@@ -248,7 +224,6 @@ final class WP_Post {
 	 *
 	 * @since 3.5.0
 	 * @static
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index f1594c6bfb..3184e04c2f 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -21,7 +21,6 @@ class WP_Query {
 	 * Query vars set by the user
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var array
 	 */
 	public $query;
@@ -30,7 +29,6 @@ class WP_Query {
 	 * Query vars, after parsing
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars = array();
@@ -39,7 +37,6 @@ class WP_Query {
 	 * Taxonomy query, as passed to get_tax_sql()
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 * @var object WP_Tax_Query
 	 */
 	public $tax_query;
@@ -48,7 +45,6 @@ class WP_Query {
 	 * Metadata query container
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 * @var object WP_Meta_Query
 	 */
 	public $meta_query = false;
@@ -57,7 +53,6 @@ class WP_Query {
 	 * Date query container
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var object WP_Date_Query
 	 */
 	public $date_query = false;
@@ -68,7 +63,6 @@ class WP_Query {
 	 * Holds the contents of a post, page, category, attachment.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var object|array
 	 */
 	public $queried_object;
@@ -77,7 +71,6 @@ class WP_Query {
 	 * The ID of the queried object.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $queried_object_id;
@@ -86,7 +79,6 @@ class WP_Query {
 	 * Get post database query.
 	 *
 	 * @since 2.0.1
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -95,7 +87,6 @@ class WP_Query {
 	 * List of posts.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var array
 	 */
 	public $posts;
@@ -104,7 +95,6 @@ class WP_Query {
 	 * The amount of posts for the current query.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $post_count = 0;
@@ -113,7 +103,6 @@ class WP_Query {
 	 * Index of the current item in the loop.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var int
 	 */
 	public $current_post = -1;
@@ -122,7 +111,6 @@ class WP_Query {
 	 * Whether the loop has started and the caller is in the loop.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var bool
 	 */
 	public $in_the_loop = false;
@@ -131,7 +119,6 @@ class WP_Query {
 	 * The current post.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var WP_Post
 	 */
 	public $post;
@@ -140,7 +127,6 @@ class WP_Query {
 	 * The list of comments for current post.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var array
 	 */
 	public $comments;
@@ -149,7 +135,6 @@ class WP_Query {
 	 * The amount of comments for the posts.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment_count = 0;
@@ -158,7 +143,6 @@ class WP_Query {
 	 * The index of the comment in the comment loop.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var int
 	 */
 	public $current_comment = -1;
@@ -167,7 +151,6 @@ class WP_Query {
 	 * Current comment ID.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var int
 	 */
 	public $comment;
@@ -178,7 +161,6 @@ class WP_Query {
 	 * If limit clause was not used, equals $post_count.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $found_posts = 0;
@@ -187,7 +169,6 @@ class WP_Query {
 	 * The amount of pages.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $max_num_pages = 0;
@@ -196,7 +177,6 @@ class WP_Query {
 	 * The amount of comment pages.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 * @var int
 	 */
 	public $max_num_comment_pages = 0;
@@ -205,7 +185,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a single post.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_single = false;
@@ -214,7 +193,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a preview.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_preview = false;
@@ -223,7 +201,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a page.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_page = false;
@@ -232,7 +209,6 @@ class WP_Query {
 	 * Signifies whether the current query is for an archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_archive = false;
@@ -241,7 +217,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a date archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_date = false;
@@ -250,7 +225,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a year archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_year = false;
@@ -259,7 +233,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a month archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_month = false;
@@ -268,7 +241,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a day archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_day = false;
@@ -277,7 +249,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a specific time.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_time = false;
@@ -286,7 +257,6 @@ class WP_Query {
 	 * Signifies whether the current query is for an author archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_author = false;
@@ -295,7 +265,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a category archive.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_category = false;
@@ -304,7 +273,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a tag archive.
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_tag = false;
@@ -313,7 +281,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a taxonomy archive.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_tax = false;
@@ -322,7 +289,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a search.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_search = false;
@@ -331,7 +297,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a feed.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_feed = false;
@@ -340,7 +305,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a comment feed.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_comment_feed = false;
@@ -349,7 +313,6 @@ class WP_Query {
 	 * Signifies whether the current query is for trackback endpoint call.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_trackback = false;
@@ -358,7 +321,6 @@ class WP_Query {
 	 * Signifies whether the current query is for the site homepage.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_home = false;
@@ -367,7 +329,6 @@ class WP_Query {
 	 * Signifies whether the current query couldn't find anything.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_404 = false;
@@ -376,7 +337,6 @@ class WP_Query {
 	 * Signifies whether the current query is for an embed.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_embed = false;
@@ -385,7 +345,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a paged result and not for the first page.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_paged = false;
@@ -394,7 +353,6 @@ class WP_Query {
 	 * Signifies whether the current query is for an administrative interface page.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_admin = false;
@@ -403,7 +361,6 @@ class WP_Query {
 	 * Signifies whether the current query is for an attachment page.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_attachment = false;
@@ -413,7 +370,6 @@ class WP_Query {
 	 * (post, attachment, page, custom post types).
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_singular = false;
@@ -422,7 +378,6 @@ class WP_Query {
 	 * Signifies whether the current query is for the robots.txt file.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_robots = false;
@@ -433,7 +388,6 @@ class WP_Query {
 	 * Basically, the homepage if the option isn't set for the static homepage.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_posts_page = false;
@@ -442,7 +396,6 @@ class WP_Query {
 	 * Signifies whether the current query is for a post type archive.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_post_type_archive = false;
@@ -452,7 +405,6 @@ class WP_Query {
 	 * whether we have to re-parse because something has changed
 	 *
 	 * @since 3.1.0
-	 * @access private
 	 * @var bool|string
 	 */
 	private $query_vars_hash = false;
@@ -462,7 +414,6 @@ class WP_Query {
 	 * via pre_get_posts hooks.
 	 *
 	 * @since 3.1.1
-	 * @access private
 	 */
 	private $query_vars_changed = true;
 
@@ -470,7 +421,6 @@ class WP_Query {
 	 * Set if post thumbnails are cached
 	 *
 	 * @since 3.2.0
-	 * @access public
 	 * @var bool
 	 */
 	 public $thumbnails_cached = false;
@@ -493,7 +443,6 @@ class WP_Query {
 	 * The query flags are what page info WordPress was able to figure out.
 	 *
 	 * @since 2.0.0
-	 * @access private
 	 */
 	private function init_query_flags() {
 		$this->is_single = false;
@@ -528,7 +477,6 @@ class WP_Query {
 	 * Initiates object properties and sets default values.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 */
 	public function init() {
 		unset($this->posts);
@@ -556,7 +504,6 @@ class WP_Query {
 	 * Reparse the query vars.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 */
 	public function parse_query_vars() {
 		$this->parse_query();
@@ -567,7 +514,6 @@ class WP_Query {
 	 *
 	 * @since 2.1.0
 	 * @since 4.4.0 Removed the `comments_popup` public query variable.
-	 * @access public
 	 *
 	 * @param array $array Defined query variables.
 	 * @return array Complete query variables with undefined ones filled in empty.
@@ -642,7 +588,6 @@ class WP_Query {
 	 *              Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts.
 	 * @since 4.6.0 Added 'post_name__in' support for `$orderby`. Introduced the `$lazy_load_term_meta` argument.
 	 * @since 4.9.0 Introduced the `$comment_count` parameter.
-	 * @access public
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or string of Query parameters.
@@ -1066,7 +1011,6 @@ class WP_Query {
 	 *
 	 * For BC, this method is not marked as protected. See [28987].
 	 *
-	 * @access protected
 	 * @since 3.1.0
 	 *
 	 * @param array $q The query variables. Passed by reference.
@@ -1295,7 +1239,6 @@ class WP_Query {
 	 * Generates SQL for the WHERE clause based on passed search terms.
 	 *
 	 * @since 3.7.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -1452,7 +1395,6 @@ class WP_Query {
 	 * Generates SQL for the ORDER BY condition based on passed search terms.
 	 *
 	 * @since 3.7.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -1509,7 +1451,6 @@ class WP_Query {
 	 * Converts the given orderby alias (if allowed) to a properly-prefixed value.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -1603,7 +1544,6 @@ class WP_Query {
 	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
@@ -1624,7 +1564,6 @@ class WP_Query {
 	 * Sets the 404 property and saves whether query is feed.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 */
 	public function set_404() {
 		$is_feed = $this->is_feed;
@@ -1641,7 +1580,6 @@ class WP_Query {
 	 * @since 1.5.0
 	 * @since 3.9.0 The `$default` argument was introduced.
 	 *
-	 * @access public
 	 *
 	 * @param string $query_var Query variable key.
 	 * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
@@ -1659,7 +1597,6 @@ class WP_Query {
 	 * Set query variable.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string $query_var Query variable key.
 	 * @param mixed  $value     Query variable value.
@@ -1675,7 +1612,6 @@ class WP_Query {
 	 * database query.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return array List of posts.
 	 */
@@ -3074,7 +3010,6 @@ class WP_Query {
 	 * for the current query.
 	 *
 	 * @since 3.5.0
-	 * @access private
 	 *
 	 * @param array  $q      Query variables.
 	 * @param string $limits LIMIT clauses of the query.
@@ -3118,7 +3053,6 @@ class WP_Query {
 	 * Set up the next post and iterate current post index.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return WP_Post Next post.
 	 */
@@ -3137,7 +3071,6 @@ class WP_Query {
 	 * property to true.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @global WP_Post $post
 	 */
@@ -3165,7 +3098,6 @@ class WP_Query {
 	 * Calls the {@see 'loop_end'} action when the loop is complete.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return bool True if posts are available, false if end of loop.
 	 */
@@ -3202,7 +3134,6 @@ class WP_Query {
 	 * Rewind the posts and reset post index.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
@@ -3215,7 +3146,6 @@ class WP_Query {
 	 * Iterate current comment index and return WP_Comment object.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 *
 	 * @return WP_Comment Comment object.
 	 */
@@ -3230,7 +3160,6 @@ class WP_Query {
 	 * Sets up the current comment.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @global WP_Comment $comment Current comment.
 	 */
 	public function the_comment() {
@@ -3254,7 +3183,6 @@ class WP_Query {
 	 * Automatically rewinds comments when finished.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 *
 	 * @return bool True, if more comments. False, if no more posts.
 	 */
@@ -3272,7 +3200,6 @@ class WP_Query {
 	 * Rewind the comments, resets the comment index and comment to first.
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
@@ -3285,7 +3212,6 @@ class WP_Query {
 	 * Sets up the WordPress query by parsing query string.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string|array $query URL query string or array of query arguments.
 	 * @return array List of posts.
@@ -3304,7 +3230,6 @@ class WP_Query {
 	 * query variable. After it is set up, it will be returned.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return object
 	 */
@@ -3376,7 +3301,6 @@ class WP_Query {
 	 * Retrieve ID of the current queried object.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return int
 	 */
@@ -3396,7 +3320,6 @@ class WP_Query {
 	 * Sets up the WordPress query, if parameter is not empty.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string|array $query URL query string or array of vars.
 	 */
@@ -3410,7 +3333,6 @@ class WP_Query {
 	 * Make private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -3425,7 +3347,6 @@ class WP_Query {
 	 * Make private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -3440,7 +3361,6 @@ class WP_Query {
 	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index 17c58b90a8..30452f695a 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -43,7 +43,6 @@ class WP_Rewrite {
 	 * Base for the author permalink structure (example.com/$author_base/authorname).
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $author_base = 'author';
@@ -52,7 +51,6 @@ class WP_Rewrite {
 	 * Permalink structure for author archives.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $author_structure;
@@ -61,7 +59,6 @@ class WP_Rewrite {
 	 * Permalink structure for date archives.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $date_structure;
@@ -70,7 +67,6 @@ class WP_Rewrite {
 	 * Permalink structure for pages.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $page_structure;
@@ -79,7 +75,6 @@ class WP_Rewrite {
 	 * Base of the search permalink structure (example.com/$search_base/query).
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $search_base = 'search';
@@ -88,7 +83,6 @@ class WP_Rewrite {
 	 * Permalink structure for searches.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $search_structure;
@@ -97,7 +91,6 @@ class WP_Rewrite {
 	 * Comments permalink base.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $comments_base = 'comments';
@@ -114,7 +107,6 @@ class WP_Rewrite {
 	 * Comments pagination permalink base.
 	 *
 	 * @since 4.2.0
-	 * @access private
 	 * @var string
 	 */
 	var $comments_pagination_base = 'comment-page';
@@ -123,7 +115,6 @@ class WP_Rewrite {
 	 * Feed permalink base.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $feed_base = 'feed';
@@ -132,7 +123,6 @@ class WP_Rewrite {
 	 * Comments feed permalink structure.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $comment_feed_structure;
@@ -141,7 +131,6 @@ class WP_Rewrite {
 	 * Feed request permalink structure.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $feed_structure;
@@ -154,7 +143,6 @@ class WP_Rewrite {
 	 * then the front is "/".
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see WP_Rewrite::init()
@@ -169,7 +157,6 @@ class WP_Rewrite {
 	 * will be empty.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 *
 	 * @see WP_Rewrite::init()
@@ -181,7 +168,6 @@ class WP_Rewrite {
 	 * The name of the index file which is the entry point to all requests.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $index = 'index.php';
@@ -190,7 +176,6 @@ class WP_Rewrite {
 	 * Variable name to use for regex matches in the rewritten query.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var string
 	 */
 	var $matches = '';
@@ -199,7 +184,6 @@ class WP_Rewrite {
 	 * Rewrite rules to match against the request to find the redirect or query.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var array
 	 */
 	var $rules;
@@ -210,7 +194,6 @@ class WP_Rewrite {
 	 * Those not generated by the class, see add_rewrite_rule().
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var array
 	 */
 	var $extra_rules = array();
@@ -221,7 +204,6 @@ class WP_Rewrite {
 	 * Those not generated by the class, see add_rewrite_rule().
 	 *
 	 * @since 2.3.0
-	 * @access private
 	 * @var array
 	 */
 	var $extra_rules_top = array();
@@ -233,7 +215,6 @@ class WP_Rewrite {
 	 * and are added by add_external_rule().
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var array
 	 */
 	var $non_wp_rules = array();
@@ -242,7 +223,6 @@ class WP_Rewrite {
 	 * Extra permalink structures, e.g. categories, added by add_permastruct().
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var array
 	 */
 	var $extra_permastructs = array();
@@ -251,7 +231,6 @@ class WP_Rewrite {
 	 * Endpoints (like /trackback/) added by add_rewrite_endpoint().
 	 *
 	 * @since 2.1.0
-	 * @access private
 	 * @var array
 	 */
 	var $endpoints;
@@ -263,7 +242,6 @@ class WP_Rewrite {
 	 * to the .htaccess file.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var bool
 	 *
 	 * @see WP_Rewrite::mod_rewrite_rules()
@@ -281,7 +259,6 @@ class WP_Rewrite {
 	 * permastruct is actually a page before accepting it.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 * @var bool
 	 *
 	 * @see WP_Rewrite::init()
@@ -298,7 +275,6 @@ class WP_Rewrite {
 	 * Additional tags can be added with add_rewrite_tag().
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var array
 	 */
 	var $rewritecode = array(
@@ -320,7 +296,6 @@ class WP_Rewrite {
 	 * of rewrite tags, see WP_Rewrite::$rewritecode.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var array
 	 */
 	var $rewritereplace = array(
@@ -341,7 +316,6 @@ class WP_Rewrite {
 	 * Query variables that rewrite tags map to, see WP_Rewrite::$rewritecode.
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var array
 	 */
 	var $queryreplace = array(
@@ -372,7 +346,6 @@ class WP_Rewrite {
 	 * This can be either rewrite module or permalink in the HTTP query string.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return bool True, if permalinks are enabled.
 	 */
@@ -386,7 +359,6 @@ class WP_Rewrite {
 	 * Means that permalink links are enabled and index.php is in the URL.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return bool Whether permalink links are enabled and index.php is in the URL.
 	 */
@@ -405,7 +377,6 @@ class WP_Rewrite {
 	 * Using permalinks and index.php is not in the URL.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return bool Whether permalink links are enabled and index.php is NOT in the URL.
 	 */
@@ -424,7 +395,6 @@ class WP_Rewrite {
 	 * value of the $number parameter.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param int $number Index number.
 	 * @return string
@@ -448,7 +418,6 @@ class WP_Rewrite {
 	 * retrieved.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -492,7 +461,6 @@ class WP_Rewrite {
 	 * Retrieves all of the rewrite rules for pages.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return array Page rewrite rules.
 	 */
@@ -519,7 +487,6 @@ class WP_Rewrite {
 	 * structure.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
@@ -575,7 +542,6 @@ class WP_Rewrite {
 	 * permalink structures.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return false|string False on failure. Year structure on success.
 	 */
@@ -599,7 +565,6 @@ class WP_Rewrite {
 	 * structures. Keeps the year permalink structure.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return false|string False on failure. Year/Month structure on success.
 	 */
@@ -621,7 +586,6 @@ class WP_Rewrite {
 	 * Keeps date permalink structure with all year, month, and day.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False on failure. Year/Month/Day structure on success.
 	 */
@@ -638,7 +602,6 @@ class WP_Rewrite {
 	 * the category_base property value.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False on failure. Category permalink structure.
 	 */
@@ -655,7 +618,6 @@ class WP_Rewrite {
 	 * property value.
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 *
 	 * @return string|false False on failure. Tag permalink structure.
 	 */
@@ -667,7 +629,6 @@ class WP_Rewrite {
 	 * Retrieves an extra permalink structure by name.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 *
 	 * @param string $name Permalink structure name.
 	 * @return string|false False if not found. Permalink structure string.
@@ -690,7 +651,6 @@ class WP_Rewrite {
 	 * without attempting to set the value again.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False if not found. Permalink structure string.
 	 */
@@ -716,7 +676,6 @@ class WP_Rewrite {
 	 * without attempting to set the value again.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False if not found. Permalink structure string.
 	 */
@@ -742,7 +701,6 @@ class WP_Rewrite {
 	 * value again.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False if not found. Permalink structure string.
 	 */
@@ -768,7 +726,6 @@ class WP_Rewrite {
 	 * without attempting to set the value again.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False if not found. Permalink structure string.
 	 */
@@ -794,7 +751,6 @@ class WP_Rewrite {
 	 * and then return it without attempting to set the value again.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string|false False if not found. Permalink structure string.
 	 */
@@ -819,7 +775,6 @@ class WP_Rewrite {
 	 * that tag, otherwise add the new tag.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @see WP_Rewrite::$rewritecode
 	 * @see WP_Rewrite::$rewritereplace
@@ -846,7 +801,6 @@ class WP_Rewrite {
 	 * Removes an existing rewrite tag.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @see WP_Rewrite::$rewritecode
 	 * @see WP_Rewrite::$rewritereplace
@@ -871,7 +825,6 @@ class WP_Rewrite {
 	 * so best just ignore the contents and move to the parameters.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string $permalink_structure The permalink structure.
 	 * @param int    $ep_mask             Optional. Endpoint mask defining what endpoints are added to the structure.
@@ -1237,7 +1190,6 @@ class WP_Rewrite {
 	 * rewrite rules does.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @see WP_Rewrite::generate_rewrite_rules() See for long description and rest of parameters.
 	 *
@@ -1263,7 +1215,6 @@ class WP_Rewrite {
 	 * from the function.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return array An associate array of matches and queries.
 	 */
@@ -1466,7 +1417,6 @@ class WP_Rewrite {
 	 * in the form of caching.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return array Rewrite rules.
 	 */
@@ -1495,7 +1445,6 @@ class WP_Rewrite {
 	 * the WordPress rewrite rules one.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @return string
 	 */
@@ -1580,7 +1529,6 @@ class WP_Rewrite {
 	 * the process that will.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param bool $add_parent_tags Optional. Whether to add parent tags to the rewrite rule sets.
 	 *                              Default false.
@@ -1633,7 +1581,6 @@ class WP_Rewrite {
 	 *
 	 * @since 2.1.0
 	 * @since 4.4.0 Array support was added to the `$query` parameter.
-	 * @access public
 	 *
 	 * @param string       $regex Regular expression to match request against.
 	 * @param string|array $query The corresponding query vars for this rewrite rule.
@@ -1667,7 +1614,6 @@ class WP_Rewrite {
 	 * Adds a rewrite rule that doesn't correspond to index.php.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $regex Regular expression to match request against.
 	 * @param string $query The corresponding query vars for this rewrite rule.
@@ -1682,7 +1628,6 @@ class WP_Rewrite {
 	 * @since 2.1.0
 	 * @since 3.9.0 $query_var parameter added.
 	 * @since 4.3.0 Added support for skipping query var registration by passing `false` to `$query_var`.
-	 * @access public
 	 *
 	 * @see add_rewrite_endpoint() for full documentation.
 	 * @global WP $wp
@@ -1722,7 +1667,6 @@ class WP_Rewrite {
 	 * works on the new permastruct.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 *
 	 * @param string $name   Name for permalink structure.
 	 * @param string $struct Permalink structure (e.g. category/%category%)
@@ -1778,7 +1722,6 @@ class WP_Rewrite {
 	 * Removes a permalink structure.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $name Name for permalink structure.
 	 */
@@ -1793,7 +1736,6 @@ class WP_Rewrite {
 	 * If the function named 'save_mod_rewrite_rules' exists, it will be called.
 	 *
 	 * @since 2.0.1
-	 * @access public
 	 *
 	 * @staticvar bool $do_hard_later
 	 *
@@ -1843,7 +1785,6 @@ class WP_Rewrite {
 	 * '%tag%', or '%author%'.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 */
 	public function init() {
 		$this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
@@ -1880,7 +1821,6 @@ class WP_Rewrite {
 	 * processed passing the old and new values
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string $permalink_structure Permalink structure.
 	 */
@@ -1911,7 +1851,6 @@ class WP_Rewrite {
 	 * after the option is updated.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 * @param string $category_base Category permalink structure base.
 	 */
@@ -1930,7 +1869,6 @@ class WP_Rewrite {
 	 * the option is updated.
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 *
 	 * @param string $tag_base Tag permalink structure base.
 	 */
@@ -1945,7 +1883,6 @@ class WP_Rewrite {
 	 * Constructor - Calls init(), which runs setup.
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 *
 	 */
 	public function __construct() {
diff --git a/wp-includes/class-wp-role.php b/wp-includes/class-wp-role.php
index 6c9702de04..33d8dfe369 100644
--- a/wp-includes/class-wp-role.php
+++ b/wp-includes/class-wp-role.php
@@ -17,7 +17,6 @@ class WP_Role {
 	 * Role name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $name;
@@ -26,7 +25,6 @@ class WP_Role {
 	 * List of capabilities the role contains.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $capabilities;
@@ -38,7 +36,6 @@ class WP_Role {
 	 * and the value a boolean of whether it is granted to the role.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 * @param array $capabilities List of capabilities.
@@ -52,7 +49,6 @@ class WP_Role {
 	 * Assign role a capability.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether role has capability privilege.
@@ -71,7 +67,6 @@ class WP_Role {
 	 * because you don't need to enter the role name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $cap Capability name.
 	 */
@@ -89,7 +84,6 @@ class WP_Role {
 	 * The third and final parameter for the hook is the role name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $cap Capability name.
 	 * @return bool True if the role has the given capability. False otherwise.
diff --git a/wp-includes/class-wp-roles.php b/wp-includes/class-wp-roles.php
index 23e05d7b1b..c06ac77b36 100644
--- a/wp-includes/class-wp-roles.php
+++ b/wp-includes/class-wp-roles.php
@@ -28,7 +28,6 @@ class WP_Roles {
 	 * List of roles and capabilities.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $roles;
@@ -37,7 +36,6 @@ class WP_Roles {
 	 * List of the role objects.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $role_objects = array();
@@ -46,7 +44,6 @@ class WP_Roles {
 	 * List of role names.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $role_names = array();
@@ -55,7 +52,6 @@ class WP_Roles {
 	 * Option name for storing role list.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $role_key;
@@ -64,7 +60,6 @@ class WP_Roles {
 	 * Whether to use the database for retrieval and storage.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var bool
 	 */
 	public $use_db = true;
@@ -82,7 +77,6 @@ class WP_Roles {
 	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
@@ -103,7 +97,6 @@ class WP_Roles {
 	 * be used and the role option will not be updated or used.
 	 *
 	 * @since 2.1.0
-	 * @access protected
 	 *
 	 * @global array $wp_user_roles Used to set the 'roles' property value.
 	 */
@@ -146,7 +139,6 @@ class WP_Roles {
 	 *
 	 * @since 3.5.0
 	 * @deprecated 4.7.0 Use new WP_Roles()
-	 * @access public
 	 */
 	public function reinit() {
 		_deprecated_function( __METHOD__, '4.7.0', 'new WP_Roles()' );
@@ -162,7 +154,6 @@ class WP_Roles {
 	 * To explicitly deny a role a capability you set the value for that capability to false.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 * @param string $display_name Role display name.
@@ -189,7 +180,6 @@ class WP_Roles {
 	 * Remove role by name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 */
@@ -212,7 +202,6 @@ class WP_Roles {
 	 * Add capability to role.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 * @param string $cap Capability name.
@@ -231,7 +220,6 @@ class WP_Roles {
 	 * Remove capability from role.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 * @param string $cap Capability name.
@@ -249,7 +237,6 @@ class WP_Roles {
 	 * Retrieve role object by name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 * @return WP_Role|null WP_Role object if found, null if the role does not exist.
@@ -265,7 +252,6 @@ class WP_Roles {
 	 * Retrieve list of role names.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @return array List of role names.
 	 */
@@ -277,7 +263,6 @@ class WP_Roles {
 	 * Whether role name is currently in the list of available roles.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name to look up.
 	 * @return bool
diff --git a/wp-includes/class-wp-session-tokens.php b/wp-includes/class-wp-session-tokens.php
index b1f90bfd5c..993b81ef5c 100644
--- a/wp-includes/class-wp-session-tokens.php
+++ b/wp-includes/class-wp-session-tokens.php
@@ -18,7 +18,6 @@ abstract class WP_Session_Tokens {
 	 * User ID.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 * @var int User ID.
 	 */
 	protected $user_id;
@@ -41,7 +40,6 @@ abstract class WP_Session_Tokens {
 	 * the session manager for a subclass of `WP_Session_Tokens`.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 *
 	 * @param int $user_id User whose session to manage.
@@ -64,7 +62,6 @@ abstract class WP_Session_Tokens {
 	 * Hashes a session token for storage.
 	 *
 	 * @since 4.0.0
-	 * @access private
 	 *
 	 * @param string $token Session token to hash.
 	 * @return string A hash of the session token (a verifier).
@@ -82,7 +79,6 @@ abstract class WP_Session_Tokens {
 	 * Get a user's session.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $token Session token
 	 * @return array User session
@@ -98,7 +94,6 @@ abstract class WP_Session_Tokens {
 	 * Checks that the given token is present and hasn't expired.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $token Token to verify.
 	 * @return bool Whether the token is valid for the user.
@@ -120,7 +115,6 @@ abstract class WP_Session_Tokens {
 	 * {@see 'attach_session_information'} filter).
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param int $expiration Session expiration timestamp.
 	 * @return string Session token.
@@ -164,7 +158,6 @@ abstract class WP_Session_Tokens {
 	 * Update a session token.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $token Session token to update.
 	 * @param array  $session Session information.
@@ -178,7 +171,6 @@ abstract class WP_Session_Tokens {
 	 * Destroy a session token.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $token Session token to destroy.
 	 */
@@ -192,7 +184,6 @@ abstract class WP_Session_Tokens {
 	 * except a single token, presumably the one in use.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $token_to_keep Session token to keep.
 	 */
@@ -211,7 +202,6 @@ abstract class WP_Session_Tokens {
 	 * based on expiration.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param array $session Session to check.
 	 * @return bool Whether session is valid.
@@ -224,7 +214,6 @@ abstract class WP_Session_Tokens {
 	 * Destroy all session tokens for a user.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 */
 	final public function destroy_all() {
 		$this->destroy_all_sessions();
@@ -234,7 +223,6 @@ abstract class WP_Session_Tokens {
 	 * Destroy all session tokens for all users.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 */
 	final public static function destroy_all_for_all_users() {
@@ -247,7 +235,6 @@ abstract class WP_Session_Tokens {
 	 * Retrieve all sessions of a user.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @return array Sessions of a user.
 	 */
@@ -259,7 +246,6 @@ abstract class WP_Session_Tokens {
 	 * This method should retrieve all sessions of a user, keyed by verifier.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @return array Sessions of a user, keyed by verifier.
 	 */
@@ -269,7 +255,6 @@ abstract class WP_Session_Tokens {
 	 * This method should look up a session by its verifier (token hash).
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to retrieve.
 	 * @return array|null The session, or null if it does not exist.
@@ -282,7 +267,6 @@ abstract class WP_Session_Tokens {
 	 * Omitting the second argument should destroy the session.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to update.
 	 * @param array  $session  Optional. Session. Omitting this argument destroys the session.
@@ -294,7 +278,6 @@ abstract class WP_Session_Tokens {
 	 * except a single session passed.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to keep.
 	 */
@@ -304,7 +287,6 @@ abstract class WP_Session_Tokens {
 	 * This method should destroy all sessions for a user.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 */
 	abstract protected function destroy_all_sessions();
 
@@ -312,7 +294,6 @@ abstract class WP_Session_Tokens {
 	 * This static method should destroy all session tokens for all users.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 */
 	public static function drop_sessions() {}
diff --git a/wp-includes/class-wp-simplepie-file.php b/wp-includes/class-wp-simplepie-file.php
index b87df7d9ce..49e8003036 100644
--- a/wp-includes/class-wp-simplepie-file.php
+++ b/wp-includes/class-wp-simplepie-file.php
@@ -21,7 +21,6 @@ class WP_SimplePie_File extends SimplePie_File {
 	 *
 	 * @since 2.8.0
 	 * @since 3.2.0 Updated to use a PHP5 constructor.
-	 * @access public
 	 *
 	 * @param string       $url             Remote file URL.
 	 * @param integer      $timeout         Optional. How long the connection should stay open in seconds.
diff --git a/wp-includes/class-wp-simplepie-sanitize-kses.php b/wp-includes/class-wp-simplepie-sanitize-kses.php
index dce5edce2a..ff7d7e5932 100644
--- a/wp-includes/class-wp-simplepie-sanitize-kses.php
+++ b/wp-includes/class-wp-simplepie-sanitize-kses.php
@@ -25,7 +25,6 @@ class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
 	 * Sanitizes the incoming data, to ensure that it matches the type of data expected, using KSES.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param mixed   $data The data that needs to be sanitized.
 	 * @param integer $type The type of data that it's supposed to be.
diff --git a/wp-includes/class-wp-site-query.php b/wp-includes/class-wp-site-query.php
index 774f83ea18..4d68da32cc 100644
--- a/wp-includes/class-wp-site-query.php
+++ b/wp-includes/class-wp-site-query.php
@@ -20,7 +20,6 @@ class WP_Site_Query {
 	 * SQL for database query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -29,7 +28,6 @@ class WP_Site_Query {
 	 * SQL query clauses.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sql_clauses = array(
@@ -45,7 +43,6 @@ class WP_Site_Query {
 	 * Date query container.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var object WP_Date_Query
 	 */
 	public $date_query = false;
@@ -54,7 +51,6 @@ class WP_Site_Query {
 	 * Query vars set by the user.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars;
@@ -63,7 +59,6 @@ class WP_Site_Query {
 	 * Default values for query vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_var_defaults;
@@ -72,7 +67,6 @@ class WP_Site_Query {
 	 * List of sites located by the query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $sites;
@@ -81,7 +75,6 @@ class WP_Site_Query {
 	 * The amount of found sites for the current query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var int
 	 */
 	public $found_sites = 0;
@@ -90,7 +83,6 @@ class WP_Site_Query {
 	 * The number of pages.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var int
 	 */
 	public $max_num_pages = 0;
@@ -100,7 +92,6 @@ class WP_Site_Query {
 	 *
 	 * @since 4.6.0
 	 * @since 4.8.0 Introduced the 'lang_id', 'lang__in', and 'lang__not_in' parameters.
-	 * @access public
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or query string of site query parameters. Default empty.
@@ -192,7 +183,6 @@ class WP_Site_Query {
 	 * Parses arguments passed to the site query with default query parameters.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @see WP_Site_Query::__construct()
 	 *
@@ -219,7 +209,6 @@ class WP_Site_Query {
 	 * Sets up the WordPress query for retrieving sites.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of sites, or number of sites when 'count' is passed as a query var.
@@ -234,7 +223,6 @@ class WP_Site_Query {
 	 * Retrieves a list of sites matching the query vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return array|int List of sites, or number of sites when 'count' is passed as a query var.
 	 */
@@ -329,7 +317,6 @@ class WP_Site_Query {
 	 * Used internally to get a list of site IDs matching the query vars.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -594,7 +581,6 @@ class WP_Site_Query {
 	 * if the limit clause was used.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -620,7 +606,6 @@ class WP_Site_Query {
 	 * Used internally to generate an SQL string for searching across multiple columns.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb  $wpdb WordPress database abstraction object.
 	 *
@@ -649,7 +634,6 @@ class WP_Site_Query {
 	 * Parses and sanitizes 'orderby' keys passed to the site query.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -697,7 +681,6 @@ class WP_Site_Query {
 	 * Parses an 'order' query variable and cast it to 'ASC' or 'DESC' as necessary.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
diff --git a/wp-includes/class-wp-site.php b/wp-includes/class-wp-site.php
index 4bca299ef3..f438264370 100644
--- a/wp-includes/class-wp-site.php
+++ b/wp-includes/class-wp-site.php
@@ -30,7 +30,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $blog_id;
@@ -39,7 +38,6 @@ final class WP_Site {
 	 * Domain of the site.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $domain = '';
@@ -48,7 +46,6 @@ final class WP_Site {
 	 * Path of the site.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $path = '';
@@ -62,7 +59,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $site_id = '0';
@@ -71,7 +67,6 @@ final class WP_Site {
 	 * The date on which the site was created or registered.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string Date in MySQL's datetime format.
 	 */
 	public $registered = '0000-00-00 00:00:00';
@@ -80,7 +75,6 @@ final class WP_Site {
 	 * The date and time on which site settings were last updated.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string Date in MySQL's datetime format.
 	 */
 	public $last_updated = '0000-00-00 00:00:00';
@@ -91,7 +85,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $public = '1';
@@ -102,7 +95,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $archived = '0';
@@ -116,7 +108,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $mature = '0';
@@ -127,7 +118,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $spam = '0';
@@ -138,7 +128,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $deleted = '0';
@@ -149,7 +138,6 @@ final class WP_Site {
 	 * A numeric string, for compatibility reasons.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $lang_id = '0';
@@ -159,7 +147,6 @@ final class WP_Site {
 	 *
 	 * @static
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -196,7 +183,6 @@ final class WP_Site {
 	 * default properties based on that information.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param WP_Site|object $site A site object.
 	 */
@@ -210,7 +196,6 @@ final class WP_Site {
 	 * Converts an object to array.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @return array Object as array.
 	 */
@@ -225,7 +210,6 @@ final class WP_Site {
 	 * Allows access to extended site properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key Property to get.
 	 * @return mixed Value of the property. Null if not available.
@@ -261,7 +245,6 @@ final class WP_Site {
 	 * Checks for extended site properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key Property to check if set.
 	 * @return bool Whether the property is set.
@@ -299,7 +282,6 @@ final class WP_Site {
 	 * Allows current multisite naming conventions while setting properties.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $key   Property to set.
 	 * @param mixed  $value Value to assign to the property.
@@ -323,7 +305,6 @@ final class WP_Site {
 	 * This method is used internally to lazy-load the extended properties of a site.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 *
 	 * @see WP_Site::__get()
 	 *
diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
index b5f24a263d..08209846ce 100644
--- a/wp-includes/class-wp-tax-query.php
+++ b/wp-includes/class-wp-tax-query.php
@@ -27,7 +27,6 @@ class WP_Tax_Query {
 	 * See WP_Tax_Query::__construct() for information on tax query arguments.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 * @var array
 	 */
 	public $queries = array();
@@ -36,7 +35,6 @@ class WP_Tax_Query {
 	 * The relation between the queries. Can be one of 'AND' or 'OR'.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $relation;
@@ -47,7 +45,6 @@ class WP_Tax_Query {
 	 * @since 3.2.0
 	 *
 	 * @static
-	 * @access private
 	 * @var string
 	 */
 	private static $no_results = array( 'join' => array( '' ), 'where' => array( '0 = 1' ) );
@@ -56,7 +53,6 @@ class WP_Tax_Query {
 	 * A flat list of table aliases used in the JOIN clauses.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $table_aliases = array();
@@ -68,7 +64,6 @@ class WP_Tax_Query {
 	 * number of places by WP_Query.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var array
 	 */
 	public $queried_terms = array();
@@ -77,7 +72,6 @@ class WP_Tax_Query {
 	 * Database table that where the metadata's objects are stored (eg $wpdb->users).
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $primary_table;
@@ -86,7 +80,6 @@ class WP_Tax_Query {
 	 * Column in 'primary_table' that represents the ID of the object.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $primary_id_column;
@@ -96,7 +89,6 @@ class WP_Tax_Query {
 	 *
 	 * @since 3.1.0
 	 * @since 4.1.0 Added support for `$operator` 'NOT EXISTS' and 'EXISTS' values.
-	 * @access public
 	 *
 	 * @param array $tax_query {
 	 *     Array of taxonomy query clauses.
@@ -135,7 +127,6 @@ class WP_Tax_Query {
 	 * each first-order clause contains all the necessary keys from `$defaults`.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @param array $queries Array of queries clauses.
 	 * @return array Sanitized array of query clauses.
@@ -207,7 +198,6 @@ class WP_Tax_Query {
 	 * Sanitize a 'relation' operator.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @param string $relation Raw relation key from the query argument.
 	 * @return string Sanitized relation ('AND' or 'OR').
@@ -232,7 +222,6 @@ class WP_Tax_Query {
 	 * @since 4.1.0
 	 *
 	 * @static
-	 * @access protected
 	 *
 	 * @param array $query Tax query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
@@ -247,7 +236,6 @@ class WP_Tax_Query {
 	 * @since 3.1.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param string $primary_table     Database table where the object being filtered is stored (eg wp_users).
 	 * @param string $primary_id_column ID column for the filtered object in $primary_table.
@@ -272,7 +260,6 @@ class WP_Tax_Query {
 	 * is abstracted out to maintain parity with the other Query classes.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query.
@@ -303,7 +290,6 @@ class WP_Tax_Query {
 	 * produce the properly nested SQL.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param array $query Query to parse, passed by reference.
 	 * @param int   $depth Optional. Number of tree levels deep we currently are.
@@ -385,7 +371,6 @@ class WP_Tax_Query {
 	 * Generate SQL JOIN and WHERE clauses for a "first-order" query clause.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb The WordPress database abstraction object.
 	 *
@@ -511,7 +496,6 @@ class WP_Tax_Query {
 	 * clauses that are connected by the relation 'OR'.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param array       $clause       Query clause.
 	 * @param array       $parent_query Parent query of $clause.
@@ -555,7 +539,6 @@ class WP_Tax_Query {
 	 * Validates a single query.
 	 *
 	 * @since 3.2.0
-	 * @access private
 	 *
 	 * @param array $query The single query. Passed by reference.
 	 */
diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php
index 12ed598720..e749eef2d1 100644
--- a/wp-includes/class-wp-taxonomy.php
+++ b/wp-includes/class-wp-taxonomy.php
@@ -17,7 +17,6 @@ final class WP_Taxonomy {
 	 * Taxonomy key.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $name;
@@ -26,7 +25,6 @@ final class WP_Taxonomy {
 	 * Name of the taxonomy shown in the menu. Usually plural.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $label;
@@ -35,7 +33,6 @@ final class WP_Taxonomy {
 	 * An array of labels for this taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var object
 	 */
 	public $labels = array();
@@ -44,7 +41,6 @@ final class WP_Taxonomy {
 	 * A short descriptive summary of what the taxonomy is for.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $description = '';
@@ -53,7 +49,6 @@ final class WP_Taxonomy {
 	 * Whether a taxonomy is intended for use publicly either via the admin interface or by front-end users.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $public = true;
@@ -62,7 +57,6 @@ final class WP_Taxonomy {
 	 * Whether the taxonomy is publicly queryable.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $publicly_queryable = true;
@@ -71,7 +65,6 @@ final class WP_Taxonomy {
 	 * Whether the taxonomy is hierarchical.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $hierarchical = false;
@@ -80,7 +73,6 @@ final class WP_Taxonomy {
 	 * Whether to generate and allow a UI for managing terms in this taxonomy in the admin.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_ui = true;
@@ -91,7 +83,6 @@ final class WP_Taxonomy {
 	 * If true, the taxonomy is shown as a submenu of the object type menu. If false, no menu is shown.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_in_menu = true;
@@ -100,7 +91,6 @@ final class WP_Taxonomy {
 	 * Whether the taxonomy is available for selection in navigation menus.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_in_nav_menus = true;
@@ -109,7 +99,6 @@ final class WP_Taxonomy {
 	 * Whether to list the taxonomy in the tag cloud widget controls.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_tagcloud = true;
@@ -118,7 +107,6 @@ final class WP_Taxonomy {
 	 * Whether to show the taxonomy in the quick/bulk edit panel.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_in_quick_edit = true;
@@ -127,7 +115,6 @@ final class WP_Taxonomy {
 	 * Whether to display a column for the taxonomy on its post type listing screens.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $show_admin_column = false;
@@ -136,7 +123,6 @@ final class WP_Taxonomy {
 	 * The callback function for the meta box display.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool|callable
 	 */
 	public $meta_box_cb = null;
@@ -145,7 +131,6 @@ final class WP_Taxonomy {
 	 * An array of object types this taxonomy is registered for.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var array
 	 */
 	public $object_type = null;
@@ -154,7 +139,6 @@ final class WP_Taxonomy {
 	 * Capabilities for this taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var array
 	 */
 	public $cap;
@@ -163,7 +147,6 @@ final class WP_Taxonomy {
 	 * Rewrites information for this taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var array|false
 	 */
 	public $rewrite;
@@ -172,7 +155,6 @@ final class WP_Taxonomy {
 	 * Query var string for this taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string|false
 	 */
 	public $query_var;
@@ -181,7 +163,6 @@ final class WP_Taxonomy {
 	 * Function that will be called when the count is updated.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var callable
 	 */
 	public $update_count_callback;
@@ -193,7 +174,6 @@ final class WP_Taxonomy {
 	 * respect to $rest_base and $rest_controller_class.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var bool $show_in_rest
 	 */
 	public $show_in_rest;
@@ -202,7 +182,6 @@ final class WP_Taxonomy {
 	 * The base path for this taxonomy's REST API endpoints.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var string|bool $rest_base
 	 */
 	public $rest_base;
@@ -213,7 +192,6 @@ final class WP_Taxonomy {
 	 * Custom controllers must extend WP_REST_Controller.
 	 *
 	 * @since 4.7.4
-	 * @access public
 	 * @var string|bool $rest_controller_class
 	 */
 	public $rest_controller_class;
@@ -222,7 +200,6 @@ final class WP_Taxonomy {
 	 * Whether it is a built-in taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var bool
 	 */
 	public $_builtin;
@@ -231,7 +208,6 @@ final class WP_Taxonomy {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @global WP $wp WP instance.
 	 *
@@ -250,7 +226,6 @@ final class WP_Taxonomy {
 	 * Sets taxonomy properties.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array|string $object_type Name of the object type for the taxonomy object.
 	 * @param array|string $args        Array or query string of arguments for registering a taxonomy.
@@ -382,7 +357,6 @@ final class WP_Taxonomy {
 	 * Adds the necessary rewrite rules for the taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @global WP $wp Current WordPress environment instance.
 	 */
@@ -411,7 +385,6 @@ final class WP_Taxonomy {
 	 * Removes any rewrite rules, permastructs, and rules for the taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @global WP $wp Current WordPress environment instance.
 	 */
@@ -435,7 +408,6 @@ final class WP_Taxonomy {
 	 * Registers the ajax callback for the meta box.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function add_hooks() {
 		add_filter( 'wp_ajax_add-' . $this->name, '_wp_ajax_add_hierarchical_term' );
@@ -445,7 +417,6 @@ final class WP_Taxonomy {
 	 * Removes the ajax callback for the meta box.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function remove_hooks() {
 		remove_filter( 'wp_ajax_add-' . $this->name, '_wp_ajax_add_hierarchical_term' );
diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
index 376f1b94fd..12e7dec242 100644
--- a/wp-includes/class-wp-term-query.php
+++ b/wp-includes/class-wp-term-query.php
@@ -21,7 +21,6 @@ class WP_Term_Query {
 	 * SQL string used to perform database query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -30,7 +29,6 @@ class WP_Term_Query {
 	 * Metadata query container.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var object WP_Meta_Query
 	 */
 	public $meta_query = false;
@@ -39,7 +37,6 @@ class WP_Term_Query {
 	 * Metadata query clauses.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $meta_query_clauses;
@@ -48,7 +45,6 @@ class WP_Term_Query {
 	 * SQL query clauses.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $sql_clauses = array(
@@ -63,7 +59,6 @@ class WP_Term_Query {
 	 * Query vars set by the user.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars;
@@ -72,7 +67,6 @@ class WP_Term_Query {
 	 * Default values for query vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_var_defaults;
@@ -81,7 +75,6 @@ class WP_Term_Query {
 	 * List of terms located by the query.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @var array
 	 */
 	public $terms;
@@ -94,7 +87,6 @@ class WP_Term_Query {
 	 * @since 4.6.0
 	 * @since 4.6.0 Introduced 'term_taxonomy_id' parameter.
 	 * @since 4.7.0 Introduced 'object_ids' parameter.
-	 * @access public
 	 *
 	 * @param string|array $query {
 	 *     Optional. Array or query string of term query parameters. Default empty.
@@ -225,7 +217,6 @@ class WP_Term_Query {
 	 * Parse arguments passed to the term query with default query parameters.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string|array $query WP_Term_Query arguments. See WP_Term_Query::__construct()
 	 */
@@ -284,7 +275,6 @@ class WP_Term_Query {
 	 * Sets up the query for retrieving terms.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of terms, or number of terms when 'count' is passed as a query var.
@@ -298,7 +288,6 @@ class WP_Term_Query {
 	 * Get terms, based on query_vars.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -822,7 +811,6 @@ class WP_Term_Query {
 	 * Parse and sanitize 'orderby' keys passed to the term query.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -879,7 +867,6 @@ class WP_Term_Query {
 	 * Generate the ORDER BY clause for an 'orderby' param that is potentially related to a meta query.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @param string $orderby_raw Raw 'orderby' value passed to WP_Term_Query.
 	 * @return string ORDER BY clause.
@@ -939,7 +926,6 @@ class WP_Term_Query {
 	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
@@ -960,7 +946,6 @@ class WP_Term_Query {
 	 * Used internally to generate a SQL string related to the 'search' parameter.
 	 *
 	 * @since 4.6.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
diff --git a/wp-includes/class-wp-term.php b/wp-includes/class-wp-term.php
index 76d74e060c..a036871c26 100644
--- a/wp-includes/class-wp-term.php
+++ b/wp-includes/class-wp-term.php
@@ -20,7 +20,6 @@ final class WP_Term {
 	 * Term ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $term_id;
@@ -29,7 +28,6 @@ final class WP_Term {
 	 * The term's name.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $name = '';
@@ -38,7 +36,6 @@ final class WP_Term {
 	 * The term's slug.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $slug = '';
@@ -47,7 +44,6 @@ final class WP_Term {
 	 * The term's term_group.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $term_group = '';
@@ -56,7 +52,6 @@ final class WP_Term {
 	 * Term Taxonomy ID.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $term_taxonomy_id = 0;
@@ -65,7 +60,6 @@ final class WP_Term {
 	 * The term's taxonomy name.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $taxonomy = '';
@@ -74,7 +68,6 @@ final class WP_Term {
 	 * The term's description.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $description = '';
@@ -83,7 +76,6 @@ final class WP_Term {
 	 * ID of a term's parent term.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $parent = 0;
@@ -92,7 +84,6 @@ final class WP_Term {
 	 * Cached object count for this term.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var int
 	 */
 	public $count = 0;
@@ -103,7 +94,6 @@ final class WP_Term {
 	 * Does not correspond to a database field.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $filter = 'raw';
@@ -112,7 +102,6 @@ final class WP_Term {
 	 * Retrieve WP_Term instance.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @static
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
@@ -202,7 +191,6 @@ final class WP_Term {
 	 * Constructor.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_Term|object $term Term object.
 	 */
@@ -216,7 +204,6 @@ final class WP_Term {
 	 * Sanitizes term fields, according to the filter type provided.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $filter Filter context. Accepts 'edit', 'db', 'display', 'attribute', 'js', 'raw'.
 	 */
@@ -228,7 +215,6 @@ final class WP_Term {
 	 * Converts an object to array.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Object as array.
 	 */
@@ -240,7 +226,6 @@ final class WP_Term {
 	 * Getter.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Property to get.
 	 * @return mixed Property value.
diff --git a/wp-includes/class-wp-text-diff-renderer-table.php b/wp-includes/class-wp-text-diff-renderer-table.php
index cf90276315..25ce839faf 100644
--- a/wp-includes/class-wp-text-diff-renderer-table.php
+++ b/wp-includes/class-wp-text-diff-renderer-table.php
@@ -18,7 +18,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	/**
 	 * @see Text_Diff_Renderer::_leading_context_lines
 	 * @var int
-	 * @access public
 	 * @since 2.6.0
 	 */
 	public $_leading_context_lines  = 10000;
@@ -26,7 +25,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
 	 * @var int
-	 * @access public
 	 * @since 2.6.0
 	 */
 	public $_trailing_context_lines = 10000;
@@ -35,7 +33,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Threshold for when a diff should be saved or omitted.
 	 *
 	 * @var float
-	 * @access protected
 	 * @since 2.6.0
 	 */
 	protected $_diff_threshold = 0.6;
@@ -44,7 +41,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Inline display helper object name.
 	 *
 	 * @var string
-	 * @access protected
 	 * @since 2.6.0
 	 */
 	protected $inline_diff_renderer = 'WP_Text_Diff_Renderer_inline';
@@ -53,7 +49,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Should we show the split view or not
 	 *
 	 * @var string
-	 * @access protected
 	 * @since 3.6.0
 	 */
 	protected $_show_split_view = true;
@@ -136,7 +131,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 
 	/**
 	 * @ignore
-	 * @access public
 	 *
 	 * @param array $lines
 	 * @param bool $encode
@@ -175,7 +169,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 
 	/**
 	 * @ignore
-	 * @access public
 	 *
 	 * @param array $lines
 	 * @param bool $encode
@@ -202,7 +195,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 
 	/**
 	 * @ignore
-	 * @access public
 	 *
 	 * @param array $lines
 	 * @param bool $encode
@@ -232,7 +224,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * (TRAC style) sometimes these lines can actually be deleted or added rows.
 	 * We do additional processing to figure that out
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 *
 	 * @param array $orig
@@ -320,7 +311,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Takes changed blocks and matches which rows in orig turned into which rows in final.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 *
 	 * @param array $orig  Lines of the original version of the text.
 	 * @param array $final Lines of the final version of the text.
@@ -466,7 +456,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Make private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -481,7 +470,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Make private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name  Property to check if set.
 	 * @param mixed  $value Property value.
@@ -497,7 +485,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Make private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -512,7 +499,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * Make private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to unset.
 	 */
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index 77b5742a49..2de0ef5bbb 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -12,7 +12,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Whether the theme has been marked as updateable.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var bool
 	 *
 	 * @see WP_MS_Themes_List_Table
@@ -23,7 +22,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Headers for style.css files.
 	 *
 	 * @static
-	 * @access private
 	 * @var array
 	 */
 	private static $file_headers = array(
@@ -44,7 +42,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Default themes.
 	 *
 	 * @static
-	 * @access private
 	 * @var array
 	 */
 	private static $default_themes = array(
@@ -64,7 +61,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Renamed theme tags.
 	 *
 	 * @static
-	 * @access private
 	 * @var array
 	 */
 	private static $tag_map = array(
@@ -75,7 +71,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Absolute path to the theme root, usually wp-content/themes
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $theme_root;
@@ -83,7 +78,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Header data from the theme's style.css file.
 	 *
-	 * @access private
 	 * @var array
 	 */
 	private $headers = array();
@@ -91,7 +85,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Header data from the theme's style.css file after being sanitized.
 	 *
-	 * @access private
 	 * @var array
 	 */
 	private $headers_sanitized;
@@ -101,7 +94,6 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * Cached due to sorting functions running over the translated name.
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $name_translated;
@@ -109,7 +101,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Errors encountered when initializing the theme.
 	 *
-	 * @access private
 	 * @var WP_Error
 	 */
 	private $errors;
@@ -120,7 +111,6 @@ final class WP_Theme implements ArrayAccess {
 	 * In the case of a child theme, this is directory name of the child theme.
 	 * Otherwise, 'stylesheet' is the same as 'template'.
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $stylesheet;
@@ -131,7 +121,6 @@ final class WP_Theme implements ArrayAccess {
 	 * In the case of a child theme, this is the directory name of the parent theme.
 	 * Otherwise, 'template' is the same as 'stylesheet'.
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $template;
@@ -139,7 +128,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * A reference to the parent theme, in the case of a child theme.
 	 *
-	 * @access private
 	 * @var WP_Theme
 	 */
 	private $parent;
@@ -147,7 +135,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * URL to the theme root, usually an absolute URL to wp-content/themes
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $theme_root_uri;
@@ -155,7 +142,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Flag for whether the theme's textdomain is loaded.
 	 *
-	 * @access private
 	 * @var bool
 	 */
 	private $textdomain_loaded;
@@ -163,7 +149,6 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Stores an md5 hash of the theme root, to function as the cache key.
 	 *
-	 * @access private
 	 * @var string
 	 */
 	private $cache_hash;
@@ -174,7 +159,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Default is false. Can be set with the {@see 'wp_cache_themes_persistently'} filter.
 	 *
 	 * @static
-	 * @access private
 	 * @var bool
 	 */
 	private static $persistently_cache;
@@ -185,7 +169,6 @@ final class WP_Theme implements ArrayAccess {
 	 * By default the bucket is not cached, so this value is useless.
 	 *
 	 * @static
-	 * @access private
 	 * @var bool
 	 */
 	private static $cache_expiration = 1800;
@@ -511,7 +494,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns errors property.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
@@ -526,7 +508,6 @@ final class WP_Theme implements ArrayAccess {
 	 * meaning that the theme's directory was not found, does not exist.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return bool Whether the theme exists.
 	 */
@@ -538,7 +519,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns reference to the parent theme.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
@@ -552,7 +532,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Cache entries keyed by the theme and the type of data.
 	 *
 	 * @since 3.4.0
-	 * @access private
 	 *
 	 * @param string $key Type of data to store (theme, screenshot, headers, post_templates)
 	 * @param string $data Data to store
@@ -568,7 +547,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Cache entries are keyed by the theme and the type of data.
 	 *
 	 * @since 3.4.0
-	 * @access private
 	 *
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, post_templates)
 	 * @return mixed Retrieved data
@@ -581,7 +559,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Clears the cache for the theme.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 */
 	public function cache_delete() {
 		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key )
@@ -603,7 +580,6 @@ final class WP_Theme implements ArrayAccess {
 	 * whether it is actually valid.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @return string|false String on success, false on failure.
@@ -637,7 +613,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Gets a theme header, formatted and translated for display.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @param bool $markup Optional. Whether to mark up the header. Defaults to true.
@@ -666,7 +641,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Sanitize a theme header.
 	 *
 	 * @since 3.4.0
-	 * @access private
 	 *
 	 * @staticvar array $header_tags
 	 * @staticvar array $header_tags_with_a
@@ -725,7 +699,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Mark up a theme header.
 	 *
      * @since 3.4.0
-	 * @access private
 	 *
 	 * @staticvar string $comma
 	 *
@@ -772,7 +745,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Translate a theme header.
 	 *
 	 * @since 3.4.0
-	 * @access private
 	 *
 	 * @staticvar array $tags_list
 	 *
@@ -836,7 +808,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Otherwise, get_stylesheet() is the same as get_template().
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Stylesheet
 	 */
@@ -851,7 +822,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Otherwise, the get_template() is the same as get_stylesheet().
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Template
 	 */
@@ -866,7 +836,6 @@ final class WP_Theme implements ArrayAccess {
 	 * of the child theme's files.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Absolute path of the stylesheet directory.
 	 */
@@ -884,7 +853,6 @@ final class WP_Theme implements ArrayAccess {
 	 * of the parent theme's files.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Absolute path of the template directory.
 	 */
@@ -904,7 +872,6 @@ final class WP_Theme implements ArrayAccess {
 	 * child theme's files.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string URL to the stylesheet directory.
 	 */
@@ -919,7 +886,6 @@ final class WP_Theme implements ArrayAccess {
 	 * parent theme's files.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string URL to the template directory.
 	 */
@@ -938,7 +904,6 @@ final class WP_Theme implements ArrayAccess {
 	 * This is typically the absolute path to wp-content/themes.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Theme root.
 	 */
@@ -954,7 +919,6 @@ final class WP_Theme implements ArrayAccess {
 	 * get_theme_root_uri() and allow it to run the {@see 'theme_root_uri'} filter.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return string Theme root URI.
 	 */
@@ -973,7 +937,6 @@ final class WP_Theme implements ArrayAccess {
 	 * themes, parent theme screenshots are not inherited.)
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
 	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
@@ -1005,7 +968,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Return files in the theme's directory.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param mixed $type Optional. Array of extensions to return. Defaults to all files (null).
 	 * @param int $depth Optional. How deep to search for files. Defaults to a flat scan (0 depth). -1 depth is infinite.
@@ -1026,7 +988,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Returns the theme's post templates.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Array of page templates, keyed by filename and post type,
 	 *               with the value of the translated header name.
@@ -1083,7 +1044,6 @@ final class WP_Theme implements ArrayAccess {
 	 *
 	 * @since 3.4.0
 	 * @since 4.7.0 Added the `$post_type` parameter.
-	 * @access public
 	 *
 	 * @param WP_Post|null $post      Optional. The post being edited, provided for context.
 	 * @param string       $post_type Optional. Post type to get the templates for. Default 'page'.
@@ -1126,7 +1086,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access private
 	 *
 	 * @param string            $path          Absolute path to search.
 	 * @param array|string|null $extensions    Optional. Array of extensions to find, string of a single extension,
@@ -1188,7 +1147,6 @@ final class WP_Theme implements ArrayAccess {
 	 * child theme, it should probably try to load the parent theme's translations.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return bool True if the textdomain was successfully loaded or has already been loaded.
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
@@ -1222,7 +1180,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Whether the theme is allowed (multisite only).
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param string $check Optional. Whether to check only the 'network'-wide settings, the 'site'
 	 * 	settings, or 'both'. Defaults to 'both'.
@@ -1273,7 +1230,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
@@ -1300,7 +1256,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @staticvar array $allowed_themes
 	 *
@@ -1330,7 +1285,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @staticvar array $allowed_themes
 	 *
@@ -1409,7 +1363,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Enables a theme for all sites on the current network.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
@@ -1435,7 +1388,6 @@ final class WP_Theme implements ArrayAccess {
 	 * Disables a theme for all sites on the current network.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string|array $stylesheets Stylesheet name or array of stylesheet names.
@@ -1465,7 +1417,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access public
 	 *
 	 * @param array $themes Array of themes to sort, passed by reference.
 	 */
@@ -1486,7 +1437,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access private
 	 *
 	 * @param string $a First name.
 	 * @param string $b Second name.
@@ -1503,7 +1453,6 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @static
-	 * @access private
 	 *
 	 * @param string $a First name.
 	 * @param string $b Second name.
diff --git a/wp-includes/class-wp-user-meta-session-tokens.php b/wp-includes/class-wp-user-meta-session-tokens.php
index a01ebff685..1cb5ccaa0e 100644
--- a/wp-includes/class-wp-user-meta-session-tokens.php
+++ b/wp-includes/class-wp-user-meta-session-tokens.php
@@ -18,7 +18,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Get all sessions of a user.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @return array Sessions of a user.
 	 */
@@ -51,7 +50,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Retrieve a session by its verifier (token hash).
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to retrieve.
 	 * @return array|null The session, or null if it does not exist
@@ -70,7 +68,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Update a session by its verifier.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to update.
 	 * @param array  $session  Optional. Session. Omitting this argument destroys the session.
@@ -91,7 +88,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Update a user's sessions in the usermeta table.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param array $sessions Sessions.
 	 */
@@ -107,7 +103,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Destroy all session tokens for a user, except a single session passed.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 *
 	 * @param string $verifier Verifier of the session to keep.
 	 */
@@ -120,7 +115,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Destroy all session tokens for a user.
 	 *
 	 * @since 4.0.0
-	 * @access protected
 	 */
 	protected function destroy_all_sessions() {
 		$this->update_sessions( array() );
@@ -130,7 +124,6 @@ class WP_User_Meta_Session_Tokens extends WP_Session_Tokens {
 	 * Destroy all session tokens for all users.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 * @static
 	 */
 	public static function drop_sessions() {
diff --git a/wp-includes/class-wp-user-query.php b/wp-includes/class-wp-user-query.php
index 9f8a9ddfcc..b2462dcf1d 100644
--- a/wp-includes/class-wp-user-query.php
+++ b/wp-includes/class-wp-user-query.php
@@ -20,7 +20,6 @@ class WP_User_Query {
 	 * Query vars, after parsing
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars = array();
@@ -29,7 +28,6 @@ class WP_User_Query {
 	 * List of found user ids
 	 *
 	 * @since 3.1.0
-	 * @access private
 	 * @var array
 	 */
 	private $results;
@@ -38,7 +36,6 @@ class WP_User_Query {
 	 * Total number of found users for the current query
 	 *
 	 * @since 3.1.0
-	 * @access private
 	 * @var int
 	 */
 	private $total_users = 0;
@@ -47,7 +44,6 @@ class WP_User_Query {
 	 * Metadata query container.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var WP_Meta_Query
 	 */
 	public $meta_query = false;
@@ -56,7 +52,6 @@ class WP_User_Query {
 	 * The SQL query used to fetch matching users.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -88,7 +83,6 @@ class WP_User_Query {
 	 * Fills in missing query variables with default values.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $args Query vars, as passed to `WP_User_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
@@ -140,7 +134,6 @@ class WP_User_Query {
 	 * @since 4.7.0 Added 'nicename', 'nicename__in', 'nicename__not_in', 'login', 'login__in',
 	 *              and 'login__not_in' parameters.
 	 *
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 * @global int  $blog_id
@@ -637,7 +630,6 @@ class WP_User_Query {
 	 * Retrieve query variable.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $query_var Query variable key.
 	 * @return mixed
@@ -653,7 +645,6 @@ class WP_User_Query {
 	 * Set query variable.
 	 *
 	 * @since 3.5.0
-	 * @access public
 	 *
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
@@ -665,7 +656,6 @@ class WP_User_Query {
 	/**
 	 * Used internally to generate an SQL string for searching across multiple columns
 	 *
-	 * @access protected
 	 * @since 3.1.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
@@ -699,7 +689,6 @@ class WP_User_Query {
 	 * Return the list of users.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 *
 	 * @return array Array of results.
 	 */
@@ -711,7 +700,6 @@ class WP_User_Query {
 	 * Return the total number of users for the current query.
 	 *
 	 * @since 3.1.0
-	 * @access public
 	 *
 	 * @return int Number of total users.
 	 */
@@ -723,7 +711,6 @@ class WP_User_Query {
 	 * Parse and sanitize 'orderby' keys passed to the user query.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -783,7 +770,6 @@ class WP_User_Query {
 	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
@@ -804,7 +790,6 @@ class WP_User_Query {
 	 * Make private properties readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to get.
 	 * @return mixed Property.
@@ -819,7 +804,6 @@ class WP_User_Query {
 	 * Make private properties settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name  Property to check if set.
 	 * @param mixed  $value Property value.
@@ -835,7 +819,6 @@ class WP_User_Query {
 	 * Make private properties checkable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
@@ -850,7 +833,6 @@ class WP_User_Query {
 	 * Make private properties un-settable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $name Property to unset.
 	 */
@@ -864,7 +846,6 @@ class WP_User_Query {
 	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index 7cf311dbad..ca5897418f 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -46,7 +46,6 @@ class WP_User {
 	 * The user's ID.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var int
 	 */
 	public $ID = 0;
@@ -55,7 +54,6 @@ class WP_User {
 	 * The individual capabilities the user has been given.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $caps = array();
@@ -64,7 +62,6 @@ class WP_User {
 	 * User metadata option name.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $cap_key;
@@ -73,7 +70,6 @@ class WP_User {
 	 * The roles the user is part of.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $roles = array();
@@ -82,7 +78,6 @@ class WP_User {
 	 * All capabilities the user has, including individual and role based.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $allcaps = array();
@@ -91,7 +86,6 @@ class WP_User {
 	 * The filter context applied to user data fields.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 * @var string
 	 */
 	public $filter = null;
@@ -99,7 +93,6 @@ class WP_User {
 	/**
 	 * @static
 	 * @since 3.3.0
-	 * @access private
 	 * @var array
 	 */
 	private static $back_compat_keys;
@@ -110,7 +103,6 @@ class WP_User {
 	 * Retrieves the userdata and passes it to WP_User::init().
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
@@ -250,7 +242,6 @@ class WP_User {
 	 * Makes private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
@@ -267,7 +258,6 @@ class WP_User {
 	 * Magic method for checking the existence of a certain custom field.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $key User meta key to check if set.
 	 * @return bool Whether the given user meta key is set.
@@ -297,7 +287,6 @@ class WP_User {
 	 * Magic method for accessing custom fields.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $key User meta key to retrieve.
 	 * @return mixed Value of the given user meta key (if set). If `$key` is 'id', the user ID.
@@ -336,7 +325,6 @@ class WP_User {
 	 * the value on the WP_User instance.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $key   User meta key.
 	 * @param mixed  $value User meta value.
@@ -361,7 +349,6 @@ class WP_User {
 	 * Magic method for unsetting a certain custom field.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key User meta key to unset.
 	 */
@@ -389,7 +376,6 @@ class WP_User {
 	 * Determine whether the user exists in the database.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @return bool True if user exists in the database, false if not.
 	 */
@@ -444,7 +430,6 @@ class WP_User {
 	 * property matching the 'cap_key' exists and is an array. If so, it will be
 	 * used.
 	 *
-	 * @access protected
 	 * @since 2.1.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
@@ -476,7 +461,6 @@ class WP_User {
 	 * granted permission to.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @return array List of all capabilities for the user.
 	 */
@@ -504,7 +488,6 @@ class WP_User {
 	 * Updates the user's meta data option with capabilities and roles.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 */
@@ -533,7 +516,6 @@ class WP_User {
 	 * Remove role from user.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 */
@@ -564,7 +546,6 @@ class WP_User {
 	 * of the roles from the user.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $role Role name.
 	 */
@@ -612,7 +593,6 @@ class WP_User {
 	 * value.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param int $max Max level of user.
 	 * @param string $item Level capability name.
@@ -635,7 +615,6 @@ class WP_User {
 	 * the all of the capabilities that the user has.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -649,7 +628,6 @@ class WP_User {
 	 * Add capability and grant or deny access to capability.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether to grant capability to user.
@@ -665,7 +643,6 @@ class WP_User {
 	 * Remove capability from user.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string $cap Capability name.
 	 */
@@ -683,7 +660,6 @@ class WP_User {
 	 * Remove all of the capabilities of the user.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
@@ -702,7 +678,6 @@ class WP_User {
 	 * in part, this practice is discouraged as it may produce unreliable results.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @see map_meta_cap()
 	 *
@@ -766,7 +741,6 @@ class WP_User {
 	 * Prepends 'level_' to level number.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param int $level Level number, 1 to 10.
 	 * @return string
diff --git a/wp-includes/class-wp-walker.php b/wp-includes/class-wp-walker.php
index abc99ce02f..5ed8aad853 100644
--- a/wp-includes/class-wp-walker.php
+++ b/wp-includes/class-wp-walker.php
@@ -16,7 +16,6 @@ class Walker {
 	 * What the class handles.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $tree_type;
@@ -385,7 +384,6 @@ class Walker {
 	 * Calculates the total number of root elements.
 	 *
 	 * @since 2.7.0
-	 * @access public
 	 *
 	 * @param array $elements Elements to list.
 	 * @return int Number of root elements.
diff --git a/wp-includes/class-wp-widget-factory.php b/wp-includes/class-wp-widget-factory.php
index 061625816e..1c0f79793f 100644
--- a/wp-includes/class-wp-widget-factory.php
+++ b/wp-includes/class-wp-widget-factory.php
@@ -19,7 +19,6 @@ class WP_Widget_Factory {
 	 * Widgets array.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $widgets = array();
@@ -28,7 +27,6 @@ class WP_Widget_Factory {
 	 * PHP5 constructor.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function __construct() {
 		add_action( 'widgets_init', array( $this, '_register_widgets' ), 100 );
@@ -38,7 +36,6 @@ class WP_Widget_Factory {
 	 * PHP4 constructor.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function WP_Widget_Factory() {
 		_deprecated_constructor( 'WP_Widget_Factory', '4.2.0' );
@@ -52,7 +49,6 @@ class WP_Widget_Factory {
 	 * is the minimum requirement for PHP.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 * @var array
 	 *
 	 * @see WP_Widget_Factory::hash_object()
@@ -66,7 +62,6 @@ class WP_Widget_Factory {
 	 * is the minimum requirement for PHP.
 	 *
 	 * @since 4.6.0
-	 * @access private
 	 *
 	 * @param WP_Widget $widget Widget.
 	 * @return string Object hash.
@@ -95,7 +90,6 @@ class WP_Widget_Factory {
 	 * @since 2.8.0
 	 * @since 4.6.0 Updated the `$widget` parameter to also accept a WP_Widget instance object
 	 *              instead of simply a `WP_Widget` subclass name.
-	 * @access public
 	 *
 	 * @param string|WP_Widget $widget Either the name of a `WP_Widget` subclass or an instance of a `WP_Widget` subclass.
 	 */
@@ -113,7 +107,6 @@ class WP_Widget_Factory {
 	 * @since 2.8.0
 	 * @since 4.6.0 Updated the `$widget` parameter to also accept a WP_Widget instance object
 	 *              instead of simply a `WP_Widget` subclass name.
-	 * @access public
 	 *
 	 * @param string|WP_Widget $widget Either the name of a `WP_Widget` subclass or an instance of a `WP_Widget` subclass.
 	 */
@@ -129,7 +122,6 @@ class WP_Widget_Factory {
 	 * Serves as a utility method for adding widgets to the registered widgets global.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 */
diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php
index b69b219cd9..551c238bfc 100644
--- a/wp-includes/class-wp-widget.php
+++ b/wp-includes/class-wp-widget.php
@@ -23,7 +23,6 @@ class WP_Widget {
 	 * Root ID for all widgets of this type.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var mixed|string
 	 */
 	public $id_base;
@@ -32,7 +31,6 @@ class WP_Widget {
 	 * Name for this widget type.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $name;
@@ -41,7 +39,6 @@ class WP_Widget {
 	 * Option name for this widget type.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $option_name;
@@ -50,7 +47,6 @@ class WP_Widget {
 	 * Alt option name for this widget type.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $alt_option_name;
@@ -59,7 +55,6 @@ class WP_Widget {
 	 * Option array passed to wp_register_sidebar_widget().
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $widget_options;
@@ -68,7 +63,6 @@ class WP_Widget {
 	 * Option array passed to wp_register_widget_control().
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $control_options;
@@ -77,7 +71,6 @@ class WP_Widget {
 	 * Unique ID number of the current instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var bool|int
 	 */
 	public $number = false;
@@ -86,7 +79,6 @@ class WP_Widget {
 	 * Unique ID string of the current instance (id_base-number).
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var bool|string
 	 */
 	public $id = false;
@@ -98,7 +90,6 @@ class WP_Widget {
 	 * not happen twice.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var bool
 	 */
 	public $updated = false;
@@ -113,7 +104,6 @@ class WP_Widget {
 	 * Sub-classes should over-ride this function to generate their widget code.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -131,7 +121,6 @@ class WP_Widget {
 	 * saved/updated.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -146,7 +135,6 @@ class WP_Widget {
 	 * Outputs the settings update form.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 * @return string Default return is 'noform'.
@@ -162,7 +150,6 @@ class WP_Widget {
 	 * PHP5 constructor.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param string $id_base         Optional Base ID for the widget, lowercase and unique. If left empty,
 	 *                                a portion of the widget's class name will be used Has to be unique.
@@ -184,7 +171,6 @@ class WP_Widget {
 	 * PHP4 constructor.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @see __construct()
 	 *
@@ -209,7 +195,6 @@ class WP_Widget {
 	 *
 	 * @since 2.8.0
 	 * @since 4.4.0 Array format field names are now accepted.
-	 * @access public
 	 *
 	 * @param string $field_name Field name
 	 * @return string Name attribute for $field_name
@@ -230,7 +215,6 @@ class WP_Widget {
 	 *
 	 * @since 2.8.0
 	 * @since 4.4.0 Array format field IDs are now accepted.
-	 * @access public
 	 *
 	 * @param string $field_name Field name.
 	 * @return string ID attribute for `$field_name`.
@@ -243,7 +227,6 @@ class WP_Widget {
 	 * Register all widget instances of this widget class.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function _register() {
 		$settings = $this->get_settings();
@@ -275,7 +258,6 @@ class WP_Widget {
 	 * Sets the internal order number for the widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param int $number The unique order number of this widget instance compared to other
 	 *                    instances of the same class.
@@ -289,7 +271,6 @@ class WP_Widget {
 	 * Retrieves the widget display callback.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return callable Display callback.
 	 */
@@ -301,7 +282,6 @@ class WP_Widget {
 	 * Retrieves the widget update callback.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return callable Update callback.
 	 */
@@ -313,7 +293,6 @@ class WP_Widget {
 	 * Retrieves the form callback.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return callable Form callback.
 	 */
@@ -330,7 +309,6 @@ class WP_Widget {
 	 * to transients, or anywhere else.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global WP_Customize_Manager $wp_customize
 	 *
@@ -347,7 +325,6 @@ class WP_Widget {
 	 * Finds the instance and calls WP_Widget::widget().
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array     $args        Display arguments. See WP_Widget::widget() for information
 	 *                               on accepted arguments.
@@ -404,7 +381,6 @@ class WP_Widget {
 	 * Handles changed settings (Do NOT override).
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 *
@@ -489,7 +465,6 @@ class WP_Widget {
 	 * Generates the widget control form (Do NOT override).
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param int|array $widget_args {
 	 *     Optional. Internal order number of the widget instance, or array of multi-widget arguments.
@@ -556,7 +531,6 @@ class WP_Widget {
 	 * Registers an instance of the widget class.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param integer $number Optional. The unique order number of this widget instance
 	 *                        compared to other instances of the same class. Default -1.
@@ -571,7 +545,6 @@ class WP_Widget {
 	 * Saves the settings for all instances of the widget class.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $settings Multi-dimensional array of widget instance settings.
 	 */
@@ -584,7 +557,6 @@ class WP_Widget {
 	 * Retrieves the settings for all instances of the widget class.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @return array Multi-dimensional array of widget instance settings.
 	 */
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 06e818cc57..d269655716 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -24,7 +24,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Methods.
 	 *
-	 * @access public
 	 * @var array
 	 */
 	public $methods;
@@ -32,7 +31,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Blog options.
 	 *
-	 * @access public
 	 * @var array
 	 */
 	public $blog_options;
@@ -40,7 +38,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * IXR_Error instance.
 	 *
-	 * @access public
 	 * @var IXR_Error
 	 */
 	public $error;
@@ -48,7 +45,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Flags that the user authentication has failed in this instance of wp_xmlrpc_server.
 	 *
-	 * @access protected
 	 * @var bool
 	 */
 	protected $auth_failed = false;
@@ -174,7 +170,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Make private/protected methods readable for backward compatibility.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param callable $name      Method to call.
 	 * @param array    $arguments Arguments to pass when calling.
@@ -191,7 +186,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Serves the XML-RPC request.
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 */
 	public function serve_request() {
 		$this->IXR_Server($this->methods);
@@ -724,7 +718,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Checks if the method received at least the minimum number of arguments.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 *
 	 * @param string|array $args Sanitize single string or array of strings.
 	 * @param int $count         Minimum number of arguments.
@@ -742,7 +735,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares taxonomy data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param object $taxonomy The unprepared taxonomy data.
 	 * @param array $fields    The subset of taxonomy fields to return.
@@ -785,7 +777,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares term data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param array|object $term The unprepared term data.
 	 * @return array The prepared term data.
@@ -821,7 +812,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Convert a WordPress date string to an IXR_Date object.
 	 *
-	 * @access protected
 	 *
 	 * @param string $date Date string to convert.
 	 * @return IXR_Date IXR_Date object.
@@ -836,7 +826,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Convert a WordPress GMT date string to an IXR_Date object.
 	 *
-	 * @access protected
 	 *
 	 * @param string $date_gmt WordPress GMT date string.
 	 * @param string $date     Date string.
@@ -852,7 +841,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares post data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param array $post   The unprepared post data.
 	 * @param array $fields The subset of post type fields to return.
@@ -953,7 +941,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *
 	 * @since 3.4.0
 	 * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
-	 * @access protected
 	 *
 	 * @param WP_Post_Type $post_type Post type object.
 	 * @param array        $fields    The subset of post fields to return.
@@ -1004,7 +991,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares media item data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param object $media_item     The unprepared media item data.
 	 * @param string $thumbnail_size The image size to use for the thumbnail URL.
@@ -1044,7 +1030,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares page data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param object $page The unprepared page data.
 	 * @return array The prepared page data.
@@ -1125,7 +1110,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares comment data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param object $comment The unprepared comment data.
 	 * @return array The prepared comment data.
@@ -1174,7 +1158,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares user data for return in an XML-RPC object.
 	 *
-	 * @access protected
 	 *
 	 * @param WP_User $user   The unprepared user object.
 	 * @param array   $fields The subset of user fields to return.
@@ -1319,7 +1302,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * and determining if the user has permission to do so
 	 *
 	 * @since 4.3.0
-	 * @access private
 	 *
 	 * @param array $post_data
 	 * @param bool  $update
@@ -1356,7 +1338,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Helper method for wp_newPost() and wp_editPost(), containing shared logic.
 	 *
 	 * @since 3.4.0
-	 * @access protected
 	 *
 	 * @see wp_insert_post()
 	 *
@@ -4469,7 +4450,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * Private function for retrieving a users blogs for multisite setups
 	 *
 	 * @since 3.0.0
-	 * @access protected
 	 *
 	 * @param array $args {
 	 *     Method arguments. Note: arguments must be ordered as documented.
diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index c62d79082b..33118bc014 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -12,7 +12,6 @@ class WP {
 	 * Long list of public query variables.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
@@ -23,7 +22,6 @@ class WP {
 	 * Long list of private query variables.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title', 'fields' );
@@ -32,7 +30,6 @@ class WP {
 	 * Extra query variables set by the user.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 * @var array
 	 */
 	public $extra_query_vars = array();
@@ -41,7 +38,6 @@ class WP {
 	 * Query variables for setting up the WordPress Query Loop.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var array
 	 */
 	public $query_vars;
@@ -50,7 +46,6 @@ class WP {
 	 * String parsed to set the query variables.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $query_string;
@@ -59,7 +54,6 @@ class WP {
 	 * The request path, e.g. 2015/05/06.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $request;
@@ -68,7 +62,6 @@ class WP {
 	 * Rewrite rule the request matched.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $matched_rule;
@@ -77,7 +70,6 @@ class WP {
 	 * Rewrite query the request matched.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $matched_query;
@@ -86,7 +78,6 @@ class WP {
 	 * Whether already did the permalink.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 * @var bool
 	 */
 	public $did_permalink = false;
@@ -95,7 +86,6 @@ class WP {
 	 * Add name to list of public query variables.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $qv Query variable name.
 	 */
@@ -108,7 +98,6 @@ class WP {
 	 * Removes a query variable from a list of public query variables.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $name Query variable name.
 	 */
@@ -120,7 +109,6 @@ class WP {
 	 * Set the value of a query variable.
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 *
 	 * @param string $key Query variable name.
 	 * @param mixed $value Query variable value.
@@ -136,7 +124,6 @@ class WP {
 	 * filters and actions that can be used to further manipulate the result.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @global WP_Rewrite $wp_rewrite
 	 *
@@ -394,7 +381,6 @@ class WP {
 	 *
 	 * @since 2.0.0
 	 * @since 4.4.0 `X-Pingback` header is added conditionally after posts have been queried in handle_404().
-	 * @access public
 	 */
 	public function send_headers() {
 		$headers = array();
@@ -525,7 +511,6 @@ class WP {
 	 * use the {@see 'request'} filter instead.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
@@ -560,7 +545,6 @@ class WP {
 	 * WordPress environment.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @global WP_Query     $wp_query
 	 * @global string       $query_string Query string for the loop.
@@ -597,7 +581,6 @@ class WP {
 	 * Set up the current user.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 */
 	public function init() {
 		wp_get_current_user();
@@ -607,7 +590,6 @@ class WP {
 	 * Set up the Loop based on the query variables.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @global WP_Query $wp_the_query
 	 */
@@ -631,8 +613,7 @@ class WP {
 	 * a 404 so that canonical redirection logic can kick in.
 	 *
 	 * @since 2.0.0
-     * @access public
-	 *
+     *
 	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
@@ -724,7 +705,6 @@ class WP {
 	 * object.
 	 *
 	 * @since 2.0.0
-	 * @access public
 	 *
 	 * @param string|array $query_args Passed to parse_request().
 	 */
diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
index 53ee8ebe85..ba6425836e 100644
--- a/wp-includes/class.wp-dependencies.php
+++ b/wp-includes/class.wp-dependencies.php
@@ -19,7 +19,6 @@ class WP_Dependencies {
 	/**
 	 * An array of registered handle objects.
 	 *
-	 * @access public
 	 * @since 2.6.8
 	 * @var array
 	 */
@@ -28,7 +27,6 @@ class WP_Dependencies {
 	/**
 	 * An array of queued _WP_Dependency handle objects.
 	 *
-	 * @access public
 	 * @since 2.6.8
 	 * @var array
 	 */
@@ -37,7 +35,6 @@ class WP_Dependencies {
 	/**
 	 * An array of _WP_Dependency handle objects to queue.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var array
 	 */
@@ -46,7 +43,6 @@ class WP_Dependencies {
 	/**
 	 * An array of _WP_Dependency handle objects already queued.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var array
 	 */
@@ -57,7 +53,6 @@ class WP_Dependencies {
 	 *
 	 * Arguments are appended to the item query string.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @var array
 	 */
@@ -66,7 +61,6 @@ class WP_Dependencies {
 	/**
 	 * An array of handle groups to enqueue.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 * @var array
 	 */
@@ -75,7 +69,6 @@ class WP_Dependencies {
 	/**
 	 * A handle group to enqueue.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 * @deprecated 4.5.0
 	 * @var int
@@ -87,7 +80,6 @@ class WP_Dependencies {
 	 *
 	 * Processes the items passed to it or the queue, and their dependencies.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 * @since 2.8.0 Added the `$group` parameter.
 	 *
@@ -124,7 +116,6 @@ class WP_Dependencies {
 	/**
 	 * Processes a dependency.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 *
 	 * @param string $handle Name of the item. Should be unique.
@@ -140,7 +131,6 @@ class WP_Dependencies {
 	 * Recursively builds an array of items to process taking
 	 * dependencies into account. Does NOT catch infinite loops.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 * @since 2.8.0 Added the `$group` parameter.
@@ -200,7 +190,6 @@ class WP_Dependencies {
 	 *
 	 * Registers the item if no item of that name already exists.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 *
@@ -226,7 +215,6 @@ class WP_Dependencies {
 	 *
 	 * Adds data to a registered item.
 	 *
-	 * @access public
 	 * @since 2.6.0
 	 *
 	 * @param string $handle Name of the item. Should be unique.
@@ -246,7 +234,6 @@ class WP_Dependencies {
 	 *
 	 * Gets data associated with a registered item.
 	 *
-	 * @access public
 	 * @since 3.3.0
 	 *
 	 * @param string $handle Name of the item. Should be unique.
@@ -266,7 +253,6 @@ class WP_Dependencies {
 	/**
 	 * Un-register an item or items.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 *
@@ -286,7 +272,6 @@ class WP_Dependencies {
 	 * classes, $args is appended to the item url as a query string.
 	 * Note $args is NOT the $args property of items in the $registered array.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 *
@@ -309,7 +294,6 @@ class WP_Dependencies {
 	 * Decodes handles and arguments, then dequeues handles
 	 * and removes arguments from the class property $args.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 *
@@ -354,7 +338,6 @@ class WP_Dependencies {
 	/**
 	 * Query list for an item.
 	 *
-	 * @access public
 	 * @since 2.1.0
 	 * @since 2.6.0 Moved from `WP_Scripts`.
 	 *
@@ -391,7 +374,6 @@ class WP_Dependencies {
 	/**
 	 * Set item group, unless already in a lower group.
 	 *
-	 * @access public
 	 * @since 2.8.0
 	 *
 	 * @param string $handle    Name of the item. Should be unique.
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 4394e1fe37..f43847696a 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -22,7 +22,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Full URL with trailing slash.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $base_url;
@@ -31,7 +30,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * URL of the content directory.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $content_url;
@@ -40,7 +38,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Default version string for stylesheets.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $default_version;
@@ -49,7 +46,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Holds handles of scripts which are enqueued in footer.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $in_footer = array();
@@ -58,7 +54,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Holds a list of script handles which will be concatenated.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $concat = '';
@@ -68,7 +63,6 @@ class WP_Scripts extends WP_Dependencies {
 	 *
 	 * @since 2.8.0
 	 * @deprecated 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $concat_version = '';
@@ -77,7 +71,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Whether to perform concatenation.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var bool
 	 */
 	public $do_concat = false;
@@ -87,7 +80,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * is enabled.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $print_html = '';
@@ -96,7 +88,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Holds inline code if concatenation is enabled.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $print_code = '';
@@ -108,7 +99,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Unused in core.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $ext_handles = '';
@@ -120,7 +110,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Unused in core.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $ext_version = '';
@@ -129,7 +118,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $default_dirs;
@@ -138,7 +126,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Constructor.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->init();
@@ -149,7 +136,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Initialize the class.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 */
 	public function init() {
 		/**
@@ -169,7 +155,6 @@ class WP_Scripts extends WP_Dependencies {
 	 *
 	 * @since 2.1.0
 	 * @since 2.8.0 Added the `$group` parameter.
-	 * @access public
 	 *
 	 * @param mixed $handles Optional. Scripts to be printed. (void) prints queue, (string) prints
 	 *                       that script, (array of strings) prints those scripts. Default false.
@@ -187,7 +172,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * @since 2.1.0
 	 * @since 2.8.0 Added the `$echo` parameter.
 	 * @deprecated 3.3.0
-	 * @access public
 	 *
 	 * @see print_extra_script()
 	 *
@@ -205,7 +189,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Prints extra scripts of a registered script.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $handle The script's registered handle.
 	 * @param bool   $echo   Optional. Whether to echo the extra script instead of just returning it.
@@ -233,7 +216,6 @@ class WP_Scripts extends WP_Dependencies {
 	 *
 	 * @since 2.6.0
 	 * @since 2.8.0 Added the `$group` parameter.
-	 * @access public
 	 *
 	 * @see WP_Dependencies::do_item()
 	 *
@@ -368,7 +350,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Adds extra code to a registered script.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $handle   Name of the script to add the inline script to. Must be lowercase.
 	 * @param string $data     String containing the javascript to be added.
@@ -395,7 +376,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Prints inline scripts registered for a specific handle.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $handle   Name of the script to add the inline script to. Must be lowercase.
 	 * @param string $position Optional. Whether to add the inline script before the handle
@@ -424,7 +404,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Localizes a script, only if the script has already been added.
 	 *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @param string $handle
 	 * @param string $object_name
@@ -464,7 +443,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Sets handle group.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::set_group()
 	 *
@@ -489,7 +467,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Determines script dependencies.
      *
 	 * @since 2.1.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::all_deps()
 	 *
@@ -517,7 +494,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Processes items and dependencies for the head group.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::do_items()
 	 *
@@ -532,7 +508,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Processes items and dependencies for the footer group.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::do_items()
 	 *
@@ -547,7 +522,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Whether a handle's source is in a default directory.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param string $src The source of the enqueued script.
 	 * @return bool True if found, false if not.
@@ -573,7 +547,6 @@ class WP_Scripts extends WP_Dependencies {
 	 * Resets class properties.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function reset() {
 		$this->do_concat = false;
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index e076712d3f..a157a7412d 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -22,7 +22,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Full URL with trailing slash.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $base_url;
@@ -31,7 +30,6 @@ class WP_Styles extends WP_Dependencies {
 	 * URL of the content directory.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $content_url;
@@ -40,7 +38,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Default version string for stylesheets.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $default_version;
@@ -49,7 +46,6 @@ class WP_Styles extends WP_Dependencies {
 	 * The current text direction.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 * @var string
 	 */
 	public $text_direction = 'ltr';
@@ -58,7 +54,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Holds a list of style handles which will be concatenated.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $concat = '';
@@ -68,7 +63,6 @@ class WP_Styles extends WP_Dependencies {
 	 *
 	 * @since 2.8.0
 	 * @deprecated 3.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $concat_version = '';
@@ -77,7 +71,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Whether to perform concatenation.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var bool
 	 */
 	public $do_concat = false;
@@ -87,7 +80,6 @@ class WP_Styles extends WP_Dependencies {
 	 * is enabled.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var string
 	 */
 	public $print_html = '';
@@ -96,7 +88,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Holds inline styles if concatenation is enabled.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $print_code = '';
@@ -105,7 +96,6 @@ class WP_Styles extends WP_Dependencies {
 	 * List of default directories.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 * @var array
 	 */
 	public $default_dirs;
@@ -114,7 +104,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Constructor.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 */
 	public function __construct() {
 		/**
@@ -131,7 +120,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Processes a style dependency.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::do_item()
 	 *
@@ -246,7 +234,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Adds extra CSS styles to a registered stylesheet.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $handle The style's registered handle.
 	 * @param string $code   String containing the CSS styles to be added.
@@ -271,7 +258,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Prints extra CSS styles of a registered stylesheet.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @param string $handle The style's registered handle.
 	 * @param bool   $echo   Optional. Whether to echo the inline style instead of just returning it.
@@ -300,7 +286,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Determines style dependencies.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::all_deps()
 	 *
@@ -328,7 +313,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Generates an enqueued style's fully-qualified URL.
 	 *
 	 * @since 2.6.0
-	 * @access public
 	 *
 	 * @param string $src The source of the enqueued style.
 	 * @param string $ver The version of the enqueued style.
@@ -359,7 +343,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Whether a handle's source is in a default directory.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param string $src The source of the enqueued style.
 	 * @return bool True if found, false if not.
@@ -381,7 +364,6 @@ class WP_Styles extends WP_Dependencies {
 	 * HTML 5 allows styles in the body, grab late enqueued items and output them in the footer.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 *
 	 * @see WP_Dependencies::do_items()
 	 *
@@ -396,7 +378,6 @@ class WP_Styles extends WP_Dependencies {
 	 * Resets class properties.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 */
 	public function reset() {
 		$this->do_concat = false;
diff --git a/wp-includes/customize/class-wp-customize-background-position-control.php b/wp-includes/customize/class-wp-customize-background-position-control.php
index 475a01a548..b1cd1a7dfa 100644
--- a/wp-includes/customize/class-wp-customize-background-position-control.php
+++ b/wp-includes/customize/class-wp-customize-background-position-control.php
@@ -20,7 +20,6 @@ class WP_Customize_Background_Position_Control extends WP_Customize_Control {
 	 * Type.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'background_position';
@@ -29,7 +28,6 @@ class WP_Customize_Background_Position_Control extends WP_Customize_Control {
 	 * Don't render the control content from PHP, as it's rendered via JS on load.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function render_content() {}
 
@@ -37,7 +35,6 @@ class WP_Customize_Background_Position_Control extends WP_Customize_Control {
 	 * Render a JS template for the content of the position control.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function content_template() {
 		$options = array(
diff --git a/wp-includes/customize/class-wp-customize-color-control.php b/wp-includes/customize/class-wp-customize-color-control.php
index 775a63d7a8..1e7ed17786 100644
--- a/wp-includes/customize/class-wp-customize-color-control.php
+++ b/wp-includes/customize/class-wp-customize-color-control.php
@@ -18,7 +18,6 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	/**
 	 * Type.
 	 *
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'color';
@@ -26,7 +25,6 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	/**
 	 * Statuses.
 	 *
-	 * @access public
 	 * @var array
 	 */
 	public $statuses;
@@ -35,7 +33,6 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	 * Mode.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $mode = 'full';
diff --git a/wp-includes/customize/class-wp-customize-cropped-image-control.php b/wp-includes/customize/class-wp-customize-cropped-image-control.php
index 3675242a9b..c8a55f401c 100644
--- a/wp-includes/customize/class-wp-customize-cropped-image-control.php
+++ b/wp-includes/customize/class-wp-customize-cropped-image-control.php
@@ -20,7 +20,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'cropped_image';
@@ -29,7 +28,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Suggested width for cropped image.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 */
 	public $width = 150;
@@ -38,7 +36,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Suggested height for cropped image.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 */
 	public $height = 150;
@@ -47,7 +44,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Whether the width is flexible.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var bool
 	 */
 	public $flex_width = false;
@@ -56,7 +52,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Whether the height is flexible.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var bool
 	 */
 	public $flex_height = false;
@@ -65,7 +60,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Enqueue control related scripts/styles.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function enqueue() {
 		wp_enqueue_script( 'customize-views' );
@@ -77,7 +71,6 @@ class WP_Customize_Cropped_Image_Control extends WP_Customize_Image_Control {
 	 * Refresh the parameters passed to the JavaScript via JSON.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Control::to_json()
 	 */
diff --git a/wp-includes/customize/class-wp-customize-custom-css-setting.php b/wp-includes/customize/class-wp-customize-custom-css-setting.php
index d694395d45..f395b1804b 100644
--- a/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -22,7 +22,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * The setting type.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'custom_css';
@@ -31,7 +30,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Setting Transport
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $transport = 'postMessage';
@@ -40,7 +38,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Capability required to edit this setting.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $capability = 'edit_css';
@@ -49,7 +46,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Stylesheet
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $stylesheet = '';
@@ -58,7 +54,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * WP_Customize_Custom_CSS_Setting constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @throws Exception If the setting ID does not match the pattern `custom_css[$stylesheet]`.
 	 *
@@ -82,7 +77,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Add filter to preview post value.
 	 *
 	 * @since 4.7.9
-	 * @access public
 	 *
 	 * @return bool False when preview short-circuits due no change needing to be previewed.
 	 */
@@ -101,7 +95,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * This is used in the preview when `wp_get_custom_css()` is called for rendering the styles.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @see wp_get_custom_css()
 	 *
 	 * @param string $css        Original CSS.
@@ -122,7 +115,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Fetch the value of the setting. Will return the previewed value when `preview()` is called.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 * @see WP_Customize_Setting::value()
 	 *
 	 * @return string
@@ -159,7 +151,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * @todo There are cases where valid CSS can be incorrectly marked as invalid when strings or comments include balancing characters. To fix, CSS tokenization needs to be used.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $css The input string.
 	 * @return true|WP_Error True if the input was validated, otherwise WP_Error.
@@ -269,7 +260,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * Store the CSS setting value in the custom_css custom post type for the stylesheet.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $css The input value.
 	 * @return int|false The post ID or false if the value could not be saved.
@@ -306,7 +296,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * in the CSS.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param string $opening_char The opening character.
 	 * @param string $closing_char The closing character.
@@ -328,7 +317,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * in the CSS.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param string $char A character.
 	 * @param string $css The CSS input string.
@@ -347,7 +335,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * @see self::validate()
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param string $css The CSS input string.
 	 * @return int Count.
@@ -392,7 +379,6 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 	 * using a strict "false === strpos()" comparison.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 *
 	 * @param string $css The CSS input string.
 	 * @return bool
diff --git a/wp-includes/customize/class-wp-customize-filter-setting.php b/wp-includes/customize/class-wp-customize-filter-setting.php
index f6551b6019..ad70f4f853 100644
--- a/wp-includes/customize/class-wp-customize-filter-setting.php
+++ b/wp-includes/customize/class-wp-customize-filter-setting.php
@@ -22,7 +22,6 @@ class WP_Customize_Filter_Setting extends WP_Customize_Setting {
 	 * Saves the value of the setting, using the related API.
 	 *
 	 * @since 3.4.0
-	 * @access public
 	 *
 	 * @param mixed $value The value to update.
 	 */
diff --git a/wp-includes/customize/class-wp-customize-header-image-control.php b/wp-includes/customize/class-wp-customize-header-image-control.php
index 2fe55f4204..8bf93e7df1 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -41,7 +41,6 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function enqueue() {
 		wp_enqueue_media();
@@ -85,7 +84,6 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function print_header_image_template() {
 		?>
@@ -157,7 +155,6 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	}
 
 	/**
-	 * @access public
 	 */
 	public function render_content() {
 		$this->print_header_image_template();
diff --git a/wp-includes/customize/class-wp-customize-media-control.php b/wp-includes/customize/class-wp-customize-media-control.php
index 52feea8a33..446713f623 100644
--- a/wp-includes/customize/class-wp-customize-media-control.php
+++ b/wp-includes/customize/class-wp-customize-media-control.php
@@ -19,7 +19,6 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 * Control type.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'media';
@@ -28,7 +27,6 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 * Media control mime type.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $mime_type = '';
@@ -37,7 +35,6 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 * Button labels.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var array
 	 */
 	public $button_labels = array();
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php b/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
index 4236723599..fc521b6417 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-auto-add-control.php
@@ -20,7 +20,6 @@ class WP_Customize_Nav_Menu_Auto_Add_Control extends WP_Customize_Control {
 	 * Type of control, used by JS.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu_auto_add';
@@ -29,7 +28,6 @@ class WP_Customize_Nav_Menu_Auto_Add_Control extends WP_Customize_Control {
 	 * No-op since we're using JS template.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function render_content() {}
 
@@ -37,7 +35,6 @@ class WP_Customize_Nav_Menu_Auto_Add_Control extends WP_Customize_Control {
 	 * Render the Underscore template for this control.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function content_template() {
 		?>
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-control.php b/wp-includes/customize/class-wp-customize-nav-menu-control.php
index 04fa470f0b..388c9bb17f 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-control.php
@@ -18,7 +18,6 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu';
@@ -27,7 +26,6 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 	 * The nav menu setting.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Customize_Nav_Menu_Setting
 	 */
 	public $setting;
@@ -36,7 +34,6 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 	 * Don't render the control's content - it uses a JS template instead.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_content() {}
 
@@ -44,7 +41,6 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 	 * JS/Underscore template for the control UI.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function content_template() {
 		?>
@@ -89,7 +85,6 @@ class WP_Customize_Nav_Menu_Control extends WP_Customize_Control {
 	 * Return parameters for this control.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @return array Exported parameters.
 	 */
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
index e1394d5bfd..424c8ba5d0 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
@@ -18,7 +18,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu_item';
@@ -27,7 +26,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * The nav menu item setting.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Customize_Nav_Menu_Item_Setting
 	 */
 	public $setting;
@@ -36,7 +34,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * Constructor.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Control::__construct()
 	 *
@@ -52,7 +49,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * Don't render the control's content - it's rendered with a JS template.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_content() {}
 
@@ -60,7 +56,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * JS/Underscore template for the control UI.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function content_template() {
 		?>
@@ -155,7 +150,6 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 	 * Return parameters for this control.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @return array Exported parameters.
 	 */
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
index 11b5cd6d5a..33ca5ce150 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
@@ -29,7 +29,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Setting type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = self::TYPE;
@@ -38,7 +37,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Default setting value.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var array
 	 *
 	 * @see wp_setup_nav_menu_item()
@@ -68,7 +66,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 *
 	 * @since 4.3.0
 	 * @since 4.5.0 Default changed to 'refresh'
-	 * @access public
 	 * @var string
 	 */
 	public $transport = 'refresh';
@@ -79,7 +76,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * A negative value represents a placeholder ID for a new menu not yet saved.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 */
 	public $post_id;
@@ -88,7 +84,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Storage of pre-setup menu item to prevent wasted calls to wp_setup_nav_menu_item().
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $value;
@@ -102,7 +97,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * a real post.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 *
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
@@ -115,7 +109,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * which ensures that we can apply the proper filters.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 */
 	public $original_nav_menu_term_id;
@@ -124,7 +117,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Whether or not update() was called.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $is_updated = false;
@@ -138,7 +130,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * When status is error, the error is stored in $update_error.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string updated|inserted|deleted|error
 	 *
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
@@ -150,7 +141,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Any error object returned by wp_update_nav_menu_item() when setting is updated.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Error
 	 *
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
@@ -164,7 +154,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Any supplied $args override class property defaults.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Manager $manager Bootstrap Customizer instance.
 	 * @param string               $id      An specific ID of the setting. Can be a
@@ -201,7 +190,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Clear the cached value when this nav menu item is updated.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param int $menu_id       The term ID for the menu.
 	 * @param int $menu_item_id  The post ID for the menu item.
@@ -217,7 +205,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Get the instance data for a given nav_menu_item setting.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_setup_nav_menu_item()
 	 *
@@ -274,7 +261,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Get original title.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $item Nav menu item.
 	 * @return string The original title.
@@ -311,7 +297,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Get type label.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $item Nav menu item.
 	 * @returns string The type label.
@@ -345,7 +330,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Translates some properties added by wp_setup_nav_menu_item() and removes others.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see WP_Customize_Nav_Menu_Item_Setting::value()
 	 */
@@ -441,7 +425,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 *
 	 * @since 4.3.0
 	 * @since 4.4.0 Added boolean return value.
-	 * @access public
 	 *
 	 * @see WP_Customize_Manager::post_value()
 	 *
@@ -480,7 +463,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Filters the wp_get_nav_menu_items() result to supply the previewed menu items.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_get_nav_menu_items()
 	 *
@@ -554,7 +536,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Re-apply the tail logic also applied on $items by wp_get_nav_menu_items().
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @static
 	 *
 	 * @see wp_get_nav_menu_items()
@@ -591,7 +572,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Get the value emulated into a WP_Post and set up as a nav_menu_item.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @return WP_Post With wp_setup_nav_menu_item() applied.
 	 */
@@ -659,7 +639,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * we remove that in this override.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param array $menu_item_value The value to sanitize.
 	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
@@ -743,7 +722,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * To delete a menu, the client can send false as the value.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see wp_update_nav_menu_item()
 	 *
@@ -878,7 +856,6 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * Export data for the JS client.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Nav_Menu_Item_Setting::update()
 	 *
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-location-control.php b/wp-includes/customize/class-wp-customize-nav-menu-location-control.php
index 68cd7bffc0..dff79f17ad 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-location-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-location-control.php
@@ -22,7 +22,6 @@ class WP_Customize_Nav_Menu_Location_Control extends WP_Customize_Control {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu_location';
@@ -31,7 +30,6 @@ class WP_Customize_Nav_Menu_Location_Control extends WP_Customize_Control {
 	 * Location ID.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $location_id = '';
@@ -40,7 +38,6 @@ class WP_Customize_Nav_Menu_Location_Control extends WP_Customize_Control {
 	 * Refresh the parameters passed to JavaScript via JSON.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Control::to_json()
 	 */
@@ -53,7 +50,6 @@ class WP_Customize_Nav_Menu_Location_Control extends WP_Customize_Control {
 	 * Render content just like a normal select control.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_content() {
 		if ( empty( $this->choices ) ) {
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-name-control.php b/wp-includes/customize/class-wp-customize-nav-menu-name-control.php
index a1b738c7a7..bec319d6e2 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-name-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-name-control.php
@@ -20,7 +20,6 @@ class WP_Customize_Nav_Menu_Name_Control extends WP_Customize_Control {
 	 * Type of control, used by JS.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu_name';
@@ -29,7 +28,6 @@ class WP_Customize_Nav_Menu_Name_Control extends WP_Customize_Control {
 	 * No-op since we're using JS template.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function render_content() {}
 
@@ -37,7 +35,6 @@ class WP_Customize_Nav_Menu_Name_Control extends WP_Customize_Control {
 	 * Render the Underscore template for this control.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function content_template() {
 		?>
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-section.php b/wp-includes/customize/class-wp-customize-nav-menu-section.php
index 5518b34705..c7fb5a6182 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-section.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-section.php
@@ -22,7 +22,6 @@ class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menu';
@@ -31,7 +30,6 @@ class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
 	 * Get section parameters for JS.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @return array Exported parameters.
 	 */
 	public function json() {
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-setting.php b/wp-includes/customize/class-wp-customize-nav-menu-setting.php
index 4d65cc4c7b..e3205e060a 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-setting.php
@@ -30,7 +30,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Setting type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = self::TYPE;
@@ -39,7 +38,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Default setting value.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var array
 	 *
 	 * @see wp_get_nav_menu_object()
@@ -55,7 +53,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Default transport.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $transport = 'postMessage';
@@ -66,7 +63,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * A negative value represents a placeholder ID for a new menu not yet saved.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 */
 	public $term_id;
@@ -80,7 +76,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * a real term.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var int
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::update()
@@ -92,7 +87,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Whether or not update() was called.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $is_updated = false;
@@ -106,7 +100,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * When status is error, the error is stored in `$update_error`.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string updated|inserted|deleted|error
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::update()
@@ -118,7 +111,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Any error object returned by wp_update_nav_menu_object() when setting is updated.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var WP_Error
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::update()
@@ -132,7 +124,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Any supplied $args override class property defaults.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Manager $manager Bootstrap Customizer instance.
 	 * @param string               $id      An specific ID of the setting. Can be a
@@ -159,7 +150,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Get the instance data for a given widget setting.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_get_nav_menu_object()
 	 *
@@ -206,7 +196,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 *
 	 * @since 4.3.0
 	 * @since 4.4.0 Added boolean return value
-	 * @access public
 	 *
 	 * @see WP_Customize_Manager::post_value()
 	 *
@@ -240,7 +229,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Filters the wp_get_nav_menus() result to ensure the inserted menu object is included, and the deleted one is removed.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_get_nav_menus()
 	 *
@@ -300,7 +288,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Temporary non-closure passing of orderby value to function.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 * @var string
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus()
@@ -315,7 +302,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 *
 	 * @since 4.3.0
 	 * @deprecated 4.7.0 Use wp_list_sort()
-	 * @access protected
 	 *
 	 * @param object $menu1
 	 * @param object $menu2
@@ -336,7 +322,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Requesting a nav_menu object by anything but ID is not supported.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see wp_get_nav_menu_object()
 	 *
@@ -385,7 +370,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Filters the nav_menu_options option to include this menu's auto_add preference.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param array $nav_menu_options Nav menu options including auto_add.
 	 * @return array (Kaybe) modified nav menu options.
@@ -412,7 +396,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * we remove that in this override.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param array $value The value to sanitize.
 	 * @return array|false|null Null if an input isn't valid. False if it is marked for deletion.
@@ -456,7 +439,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 *
 	 * See {@see 'customize_save_response'}.
 	 *
-	 * @access protected
 	 * @since 4.3.0
 	 * @var array
 	 *
@@ -474,7 +456,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * To delete a menu, the client can send false as the value.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see wp_update_nav_menu_object()
 	 *
@@ -597,7 +578,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Updates a nav_menu_options array.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::filter_nav_menu_options()
 	 * @see WP_Customize_Nav_Menu_Setting::update()
@@ -627,7 +607,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 	 * Export data for the JS client.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Nav_Menu_Setting::update()
 	 *
diff --git a/wp-includes/customize/class-wp-customize-nav-menus-panel.php b/wp-includes/customize/class-wp-customize-nav-menus-panel.php
index adb19ee390..122728841b 100644
--- a/wp-includes/customize/class-wp-customize-nav-menus-panel.php
+++ b/wp-includes/customize/class-wp-customize-nav-menus-panel.php
@@ -22,7 +22,6 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'nav_menus';
@@ -31,7 +30,6 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
 	 * Render screen options for Menus.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_screen_options() {
 		// Adds the screen options.
@@ -64,7 +62,6 @@ class WP_Customize_Nav_Menus_Panel extends WP_Customize_Panel {
 	 * export custom variables by overriding WP_Customize_Panel::json().
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 *
 	 * @see WP_Customize_Panel::print_template()
 	 */
diff --git a/wp-includes/customize/class-wp-customize-new-menu-control.php b/wp-includes/customize/class-wp-customize-new-menu-control.php
index 3234c543f0..24bcb1ea88 100644
--- a/wp-includes/customize/class-wp-customize-new-menu-control.php
+++ b/wp-includes/customize/class-wp-customize-new-menu-control.php
@@ -20,7 +20,6 @@ class WP_Customize_New_Menu_Control extends WP_Customize_Control {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'new_menu';
@@ -29,7 +28,6 @@ class WP_Customize_New_Menu_Control extends WP_Customize_Control {
 	 * Render the control's content.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 */
 	public function render_content() {
 		?>
diff --git a/wp-includes/customize/class-wp-customize-new-menu-section.php b/wp-includes/customize/class-wp-customize-new-menu-section.php
index ba75928f88..12723183c9 100644
--- a/wp-includes/customize/class-wp-customize-new-menu-section.php
+++ b/wp-includes/customize/class-wp-customize-new-menu-section.php
@@ -22,7 +22,6 @@ class WP_Customize_New_Menu_Section extends WP_Customize_Section {
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'new_menu';
@@ -31,7 +30,6 @@ class WP_Customize_New_Menu_Section extends WP_Customize_Section {
 	 * Render the section, and the controls that have been added to it.
 	 *
 	 * @since 4.3.0
-	 * @access protected
 	 */
 	protected function render() {
 		?>
diff --git a/wp-includes/customize/class-wp-customize-partial.php b/wp-includes/customize/class-wp-customize-partial.php
index 16f6997d73..10c480722e 100644
--- a/wp-includes/customize/class-wp-customize-partial.php
+++ b/wp-includes/customize/class-wp-customize-partial.php
@@ -22,7 +22,6 @@ class WP_Customize_Partial {
 	 * Component.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var WP_Customize_Selective_Refresh
 	 */
 	public $component;
@@ -34,7 +33,6 @@ class WP_Customize_Partial {
 	 * be the same as the associated setting's ID.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $id;
@@ -43,7 +41,6 @@ class WP_Customize_Partial {
 	 * Parsed ID.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array {
 	 *     @type string $base ID base.
 	 *     @type array  $keys Keys for multidimensional.
@@ -55,7 +52,6 @@ class WP_Customize_Partial {
 	 * Type of this partial.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'default';
@@ -64,7 +60,6 @@ class WP_Customize_Partial {
 	 * The jQuery selector to find the container element for the partial.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $selector;
@@ -72,7 +67,6 @@ class WP_Customize_Partial {
 	/**
 	 * IDs for settings tied to the partial.
 	 *
-	 * @access public
 	 * @since 4.5.0
 	 * @var array
 	 */
@@ -84,7 +78,6 @@ class WP_Customize_Partial {
 	 * If not supplied, it will default to the ID of the first setting.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $primary_setting;
@@ -96,7 +89,6 @@ class WP_Customize_Partial {
 	 * of the associated `$settings`.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $capability;
@@ -105,7 +97,6 @@ class WP_Customize_Partial {
 	 * Render callback.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @see WP_Customize_Partial::render()
 	 * @var callable Callback is called with one argument, the instance of
 	 *                 WP_Customize_Partial. The callback can either echo the
@@ -117,7 +108,6 @@ class WP_Customize_Partial {
 	 * Whether the container element is included in the partial, or if only the contents are rendered.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $container_inclusive = false;
@@ -128,7 +118,6 @@ class WP_Customize_Partial {
 	 * A partial render is considered a failure if the render_callback returns false.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var bool
 	 */
 	public $fallback_refresh = true;
@@ -141,7 +130,6 @@ class WP_Customize_Partial {
 	 * If `$args['settings']` is not defined, use the $id as the setting ID.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Selective_Refresh $component Customize Partial Refresh plugin instance.
 	 * @param string                         $id        Control ID.
@@ -184,7 +172,6 @@ class WP_Customize_Partial {
 	 * Retrieves parsed ID data for multidimensional setting.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return array {
 	 *     ID data for multidimensional partial.
@@ -201,7 +188,6 @@ class WP_Customize_Partial {
 	 * Renders the template partial involving the associated settings.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param array $container_context Optional. Array of context data associated with the target container (placement).
 	 *                                 Default empty array.
@@ -270,7 +256,6 @@ class WP_Customize_Partial {
 	 * applying to client-side templating.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Partial $partial Partial.
 	 * @param array                $context Context.
@@ -285,7 +270,6 @@ class WP_Customize_Partial {
 	 * Retrieves the data to export to the client via JSON.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return array Array of parameters passed to the JavaScript.
 	 */
@@ -308,7 +292,6 @@ class WP_Customize_Partial {
 	 * or if one of the associated settings does not exist.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return bool False if user can't edit one one of the related settings,
 	 *                    or if one of the associated settings does not exist.
diff --git a/wp-includes/customize/class-wp-customize-selective-refresh.php b/wp-includes/customize/class-wp-customize-selective-refresh.php
index a1811299d8..31156635f7 100644
--- a/wp-includes/customize/class-wp-customize-selective-refresh.php
+++ b/wp-includes/customize/class-wp-customize-selective-refresh.php
@@ -25,7 +25,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Customize manager.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @var WP_Customize_Manager
 	 */
 	public $manager;
@@ -34,7 +33,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Registered instances of WP_Customize_Partial.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var WP_Customize_Partial[]
 	 */
 	protected $partials = array();
@@ -43,7 +41,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Log of errors triggered when partials are rendered.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $triggered_errors = array();
@@ -52,7 +49,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Keep track of the current partial being rendered.
 	 *
 	 * @since 4.5.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $current_partial_id;
@@ -61,7 +57,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Plugin bootstrap for Partial Refresh functionality.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Manager $manager Manager instance.
 	 */
@@ -76,7 +71,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Retrieves the registered partials.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return array Partials.
 	 */
@@ -136,7 +130,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Retrieves a partial.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $id Customize Partial ID.
 	 * @return WP_Customize_Partial|null The partial, if set. Otherwise null.
@@ -153,7 +146,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Removes a partial.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $id Customize Partial ID.
 	 */
@@ -165,7 +157,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Initializes the Customizer preview.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function init_preview() {
 		add_action( 'template_redirect', array( $this, 'handle_render_partials_request' ) );
@@ -176,7 +167,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Enqueues preview scripts.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function enqueue_preview_scripts() {
 		wp_enqueue_script( 'customize-selective-refresh' );
@@ -187,7 +177,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Exports data in preview after it has finished rendering so that partials can be added at runtime.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function export_preview_data() {
 		$partials = array();
@@ -226,7 +215,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Registers dynamically-created partials.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Manager::add_dynamic_settings()
 	 *
@@ -292,7 +280,6 @@ final class WP_Customize_Selective_Refresh {
 	 * just that essentially the route is a match.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return bool Whether the request is for rendering partials.
 	 */
@@ -306,7 +293,6 @@ final class WP_Customize_Selective_Refresh {
 	 * These errors will be relayed back to the client in the Ajax response.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param int    $errno   Error number.
 	 * @param string $errstr  Error string.
@@ -329,7 +315,6 @@ final class WP_Customize_Selective_Refresh {
 	 * Handles the Ajax request to return the rendered partials for the requested placements.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function handle_render_partials_request() {
 		if ( ! $this->is_render_partials_request() ) {
diff --git a/wp-includes/customize/class-wp-customize-sidebar-section.php b/wp-includes/customize/class-wp-customize-sidebar-section.php
index a196b70d6d..2813251e78 100644
--- a/wp-includes/customize/class-wp-customize-sidebar-section.php
+++ b/wp-includes/customize/class-wp-customize-sidebar-section.php
@@ -20,7 +20,6 @@ class WP_Customize_Sidebar_Section extends WP_Customize_Section {
 	 * Type of this section.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'sidebar';
@@ -29,7 +28,6 @@ class WP_Customize_Sidebar_Section extends WP_Customize_Section {
 	 * Unique identifier.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var string
 	 */
 	public $sidebar_id;
@@ -51,7 +49,6 @@ class WP_Customize_Sidebar_Section extends WP_Customize_Section {
 	 * Whether the current sidebar is rendered on the page.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @return bool Whether sidebar is rendered.
 	 */
diff --git a/wp-includes/customize/class-wp-customize-site-icon-control.php b/wp-includes/customize/class-wp-customize-site-icon-control.php
index ec662776d0..4d7bcf525a 100644
--- a/wp-includes/customize/class-wp-customize-site-icon-control.php
+++ b/wp-includes/customize/class-wp-customize-site-icon-control.php
@@ -22,7 +22,6 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
 	 * Control type.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'site_icon';
@@ -31,7 +30,6 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
 	 * Constructor.
 	 *
 	 * @since 4.3.0
-	 * @access public
 	 *
 	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
 	 * @param string               $id      Control ID.
@@ -46,7 +44,6 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
 	 * Renders a JS template for the content of the site icon control.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 */
 	public function content_template() {
 		?>
diff --git a/wp-includes/customize/class-wp-customize-theme-control.php b/wp-includes/customize/class-wp-customize-theme-control.php
index 5187d022c5..ffc9c878ae 100644
--- a/wp-includes/customize/class-wp-customize-theme-control.php
+++ b/wp-includes/customize/class-wp-customize-theme-control.php
@@ -20,7 +20,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	 * Customize control type.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'theme';
@@ -29,7 +28,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	 * Theme object.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var WP_Theme
 	 */
 	public $theme;
@@ -38,7 +36,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	 * Refresh the parameters passed to the JavaScript via JSON.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @see WP_Customize_Control::to_json()
 	 */
@@ -51,7 +48,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	 * Don't render the control content from PHP, as it's rendered via JS on load.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 */
 	public function render_content() {}
 
@@ -59,7 +55,6 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 	 * Render a JS template for theme display.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 */
 	public function content_template() {
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
diff --git a/wp-includes/customize/class-wp-customize-themes-section.php b/wp-includes/customize/class-wp-customize-themes-section.php
index 9674b64542..72175a836f 100644
--- a/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/wp-includes/customize/class-wp-customize-themes-section.php
@@ -22,7 +22,6 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 	 * Customize section type.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'themes';
@@ -31,7 +30,6 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 	 * Render the themes section, which behaves like a panel.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 */
 	protected function render() {
 		$classes = 'accordion-section control-section control-section-' . $this->type;
diff --git a/wp-includes/customize/class-wp-widget-area-customize-control.php b/wp-includes/customize/class-wp-widget-area-customize-control.php
index e4e68b403c..bed0f8a5a6 100644
--- a/wp-includes/customize/class-wp-widget-area-customize-control.php
+++ b/wp-includes/customize/class-wp-widget-area-customize-control.php
@@ -20,7 +20,6 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 	 * Customize control type.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 * @var string
 	 */
 	public $type = 'sidebar_widgets';
@@ -29,7 +28,6 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 	 * Sidebar ID.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 * @var int|string
 	 */
 	public $sidebar_id;
@@ -38,7 +36,6 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 	 * Refreshes the parameters passed to the JavaScript via JSON.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function to_json() {
 		parent::to_json();
@@ -52,7 +49,6 @@ class WP_Widget_Area_Customize_Control extends WP_Customize_Control {
 	 * Renders the control's content.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function render_content() {
 		$id = 'reorder-widgets-desc-' . str_replace( array( '[', ']' ), array( '-', '' ), $this->id );
diff --git a/wp-includes/customize/class-wp-widget-form-customize-control.php b/wp-includes/customize/class-wp-widget-form-customize-control.php
index a71364521d..aada4474eb 100644
--- a/wp-includes/customize/class-wp-widget-form-customize-control.php
+++ b/wp-includes/customize/class-wp-widget-form-customize-control.php
@@ -28,7 +28,6 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 	 * Gather control params for exporting to JavaScript.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 *
 	 * @global array $wp_registered_widgets
 	 */
@@ -65,7 +64,6 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 	 * Override render_content to be no-op since content is exported via to_json for deferred embedding.
 	 *
 	 * @since 3.9.0
-	 * @access public
 	 */
 	public function render_content() {}
 
@@ -73,7 +71,6 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 	 * Whether the current widget is rendered on the page.
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @return bool Whether the widget is rendered.
 	 */
diff --git a/wp-includes/date.php b/wp-includes/date.php
index f1d079aed2..591cf79319 100644
--- a/wp-includes/date.php
+++ b/wp-includes/date.php
@@ -21,7 +21,6 @@ class WP_Date_Query {
 	 * See WP_Date_Query::__construct() for information on date query arguments.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var array
 	 */
 	public $queries = array();
@@ -30,7 +29,6 @@ class WP_Date_Query {
 	 * The default relation between top-level queries. Can be either 'AND' or 'OR'.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $relation = 'AND';
@@ -39,7 +37,6 @@ class WP_Date_Query {
 	 * The column to query against. Can be changed via the query arguments.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var string
 	 */
 	public $column = 'post_date';
@@ -48,7 +45,6 @@ class WP_Date_Query {
 	 * The value comparison operator. Can be changed via the query arguments.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 * @var array
 	 */
 	public $compare = '=';
@@ -57,7 +53,6 @@ class WP_Date_Query {
 	 * Supported time-related parameter keys.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 * @var array
 	 */
 	public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
@@ -73,7 +68,6 @@ class WP_Date_Query {
 	 * @since 3.7.0
 	 * @since 4.0.0 The $inclusive logic was updated to include all times within the date range.
 	 * @since 4.1.0 Introduced 'dayofweek_iso' time type parameter.
-	 * @access public
 	 *
 	 * @param array $date_query {
 	 *     Array of date query clauses.
@@ -191,7 +185,6 @@ class WP_Date_Query {
 	 * `$defaults`.
 	 *
 	 * @since 4.1.0
-	 * @access public
 	 *
 	 * @param array $queries
 	 * @param array $parent_query
@@ -252,7 +245,6 @@ class WP_Date_Query {
 	 * If so, it's first-order.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param  array $query Query clause.
 	 * @return bool True if this is a first-order clause.
@@ -266,7 +258,6 @@ class WP_Date_Query {
 	 * Determines and validates what comparison operator to use.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param array $query A date query or a date subquery.
 	 * @return string The comparison operator.
@@ -286,7 +277,6 @@ class WP_Date_Query {
 	 * This method only generates debug notices for these cases.
 	 *
 	 * @since  4.1.0
-	 * @access public
 	 *
 	 * @param  array $date_query The date_query array.
 	 * @return bool  True if all values in the query are valid, false if one or more fail.
@@ -482,7 +472,6 @@ class WP_Date_Query {
 	 * and are only sanitized to remove illegal characters.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
@@ -551,7 +540,6 @@ class WP_Date_Query {
 	 * Generate WHERE clause to be appended to a main query.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @return string MySQL WHERE clause.
 	 */
@@ -578,7 +566,6 @@ class WP_Date_Query {
 	 * out to maintain parity with the other Query classes.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @return array {
 	 *     Array containing JOIN and WHERE SQL clauses to append to the main query.
@@ -604,7 +591,6 @@ class WP_Date_Query {
 	 * produce the properly nested SQL.
 	 *
 	 * @since 4.1.0
-	 * @access protected
 	 *
 	 * @param array $query Query to parse.
 	 * @param int   $depth Optional. Number of tree levels deep we currently are.
@@ -689,7 +675,6 @@ class WP_Date_Query {
 	 * compatibility while retaining the naming convention across Query classes.
 	 *
 	 * @since  3.7.0
-	 * @access protected
 	 *
 	 * @param  array $query Date query arguments.
 	 * @return array {
@@ -707,7 +692,6 @@ class WP_Date_Query {
 	 * Turns a first-order date query into SQL for a WHERE clause.
 	 *
 	 * @since  4.1.0
-	 * @access protected
 	 *
 	 * @param  array $query        Date query clause.
 	 * @param  array $parent_query Parent query of the current date query.
@@ -802,7 +786,6 @@ class WP_Date_Query {
 	 * Builds and validates a value string based on the comparison operator.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param string $compare The compare operator to use
 	 * @param string|array $value The value
@@ -862,7 +845,6 @@ class WP_Date_Query {
 	 * pass a string that will be run through strtotime().
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param string|array $datetime       An array of parameters or a strotime() string
 	 * @param bool         $default_to_max Whether to round up incomplete dates. Supported by values
@@ -950,7 +932,6 @@ class WP_Date_Query {
 	 * in order to be able to accurately compare against.
 	 *
 	 * @since 3.7.0
-	 * @access public
 	 *
 	 * @param string $column The column to query against. Needs to be pre-validated!
 	 * @param string $compare The comparison operator. Needs to be pre-validated!
diff --git a/wp-includes/rest-api/class-wp-rest-request.php b/wp-includes/rest-api/class-wp-rest-request.php
index e41c014557..0f615cb0dc 100644
--- a/wp-includes/rest-api/class-wp-rest-request.php
+++ b/wp-includes/rest-api/class-wp-rest-request.php
@@ -32,7 +32,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * HTTP method.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $method = '';
@@ -44,7 +43,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * superglobals when being created from the global scope.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array Contains GET, POST and FILES keys mapping to arrays of data.
 	 */
 	protected $params;
@@ -53,7 +51,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * HTTP headers for the request.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array Map of key to value. Key is always lowercase, as per HTTP specification.
 	 */
 	protected $headers = array();
@@ -62,7 +59,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Body data.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string Binary data from the request.
 	 */
 	protected $body = null;
@@ -71,7 +67,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Route matched for the request.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $route;
@@ -83,7 +78,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * containing the callback as well as the valid methods for the route.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array Attributes for the request.
 	 */
 	protected $attributes = array();
@@ -94,7 +88,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Allows lazy-parsing of JSON data where possible.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $parsed_json = false;
@@ -103,7 +96,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Used to determine if the body data has been parsed yet.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $parsed_body = false;
@@ -112,7 +104,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Constructor.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $method     Optional. Request method. Default empty.
 	 * @param string $route      Optional. Request route. Default empty.
@@ -140,7 +131,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves the HTTP method for the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string HTTP method.
 	 */
@@ -152,7 +142,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets HTTP method for the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $method HTTP method.
 	 */
@@ -164,7 +153,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves all headers from the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Map of key to value. Key is always lowercase, as per HTTP specification.
 	 */
@@ -186,7 +174,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * @link https://nginx.org/en/docs/http/ngx_http_core_module.html#underscores_in_headers
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @static
 	 *
 	 * @param string $key Header name.
@@ -207,7 +194,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * (notably cookie headers) cannot be joined this way.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Header name, will be canonicalized to lowercase.
 	 * @return string|null String value if set, null otherwise.
@@ -226,7 +212,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves header values from the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Header name, will be canonicalized to lowercase.
 	 * @return array|null List of string values if set, null otherwise.
@@ -245,7 +230,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets the header on request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key   Header name.
 	 * @param string $value Header value, or list of values.
@@ -261,7 +245,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Appends a header value for the given header.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key   Header name.
 	 * @param string $value Header value, or list of values.
@@ -281,7 +264,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Removes all values for a header.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Header name.
 	 */
@@ -294,7 +276,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets headers on the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $headers  Map of header name to value.
 	 * @param bool  $override If true, replace the request's headers. Otherwise, merge with existing.
@@ -313,7 +294,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves the content-type of the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Map containing 'value' and 'parameters' keys.
 	 */
@@ -348,7 +328,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Used when checking parameters in get_param().
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @return array List of types to check, in order of priority.
 	 */
@@ -400,7 +379,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves a parameter from the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Parameter name.
 	 * @return mixed|null Value if set, null otherwise.
@@ -422,7 +400,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets a parameter on the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key   Parameter name.
 	 * @param mixed  $value Parameter value.
@@ -439,7 +416,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Handles merging all the available values into a single array.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Map of key to value.
 	 */
@@ -465,7 +441,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are parsed from the URL using the regex.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value.
 	 */
@@ -479,7 +454,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Typically, this is set after parsing the URL.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
@@ -493,7 +467,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the parameters you'd typically find in `$_GET`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value
 	 */
@@ -507,7 +480,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Typically, this is set from `$_GET`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
@@ -521,7 +493,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the parameters you'd typically find in `$_POST`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value.
 	 */
@@ -535,7 +506,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Typically, this is set from `$_POST`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
@@ -549,7 +519,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the parameters you'd typically find in `$_FILES`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value
 	 */
@@ -563,7 +532,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Typically, this is set from `$_FILES`.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
@@ -577,7 +545,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the parameters set in the route registration.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value
 	 */
@@ -591,7 +558,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the parameters set in the route registration.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
@@ -603,7 +569,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves the request body content.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string Binary data from the request body.
 	 */
@@ -615,7 +580,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets body content.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $data Binary data from the request body.
 	 */
@@ -632,7 +596,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves the parameters from a JSON-formatted body.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Parameter map of key to value.
 	 */
@@ -650,7 +613,6 @@ class WP_REST_Request implements ArrayAccess {
 	 *
 	 * @since 4.4.0
 	 * @since 4.7.0 Returns error instance if value cannot be decoded.
-	 * @access protected
 	 * @return true|WP_Error True if the JSON data was passed or no JSON data was provided, WP_Error if invalid JSON was passed.
 	 */
 	protected function parse_json_params() {
@@ -706,7 +668,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * natively by PHP. In PHP 5.x, only POST has these parsed automatically.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 */
 	protected function parse_body_params() {
 		if ( $this->parsed_body ) {
@@ -747,7 +708,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves the route that matched the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string Route matching regex.
 	 */
@@ -759,7 +719,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets the route that matched the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $route Route matching regex.
 	 */
@@ -773,7 +732,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * These are the options for the route that was matched.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array Attributes for the request.
 	 */
@@ -785,7 +743,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets the attributes for the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $attributes Attributes for the request.
 	 */
@@ -800,7 +757,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * argument.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return true|WP_Error True if parameters were sanitized, WP_Error if an error occurred during sanitization.
 	 */
@@ -856,7 +812,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Checks whether this request is valid according to its attributes.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return bool|WP_Error True if there are no parameters to validate or if all pass validation,
 	 *                       WP_Error if required parameters are missing.
@@ -924,7 +879,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Checks if a parameter is set.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $offset Parameter name.
 	 * @return bool Whether the parameter is set.
@@ -945,7 +899,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Retrieves a parameter from the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $offset Parameter name.
 	 * @return mixed|null Value if set, null otherwise.
@@ -958,7 +911,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Sets a parameter on the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $offset Parameter name.
 	 * @param mixed  $value  Parameter value.
@@ -971,7 +923,6 @@ class WP_REST_Request implements ArrayAccess {
 	 * Removes a parameter from the request.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $offset Parameter name.
 	 */
@@ -989,7 +940,6 @@ class WP_REST_Request implements ArrayAccess {
 	 *
 	 * @static
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @param string $url URL with protocol, domain, path and query args.
 	 * @return WP_REST_Request|false WP_REST_Request object on success, false on failure.
diff --git a/wp-includes/rest-api/class-wp-rest-response.php b/wp-includes/rest-api/class-wp-rest-response.php
index 65ae87251f..794ba1fb82 100644
--- a/wp-includes/rest-api/class-wp-rest-response.php
+++ b/wp-includes/rest-api/class-wp-rest-response.php
@@ -20,7 +20,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Links related to the response.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $links = array();
@@ -29,7 +28,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * The route that was to create the response.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $matched_route = '';
@@ -38,7 +36,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * The handler that was used to create the response.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var null|array
 	 */
 	protected $matched_handler = null;
@@ -49,7 +46,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * @internal The $rel parameter is first, as this looks nicer when sending multiple.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @link https://tools.ietf.org/html/rfc5988
 	 * @link https://www.iana.org/assignments/link-relations/link-relations.xml
@@ -79,7 +75,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Removes a link from the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param  string $rel  Link relation. Either an IANA registered type, or an absolute URL.
 	 * @param  string $href Optional. Only remove links for the relation matching the given href.
@@ -110,7 +105,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * associative arrays.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $links Map of link relation to list of links.
 	 */
@@ -131,7 +125,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves links for the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array List of links.
 	 */
@@ -145,7 +138,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * @internal The $rel parameter is first, as this looks nicer when sending multiple.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @link https://tools.ietf.org/html/rfc5988
 	 * @link https://www.iana.org/assignments/link-relations/link-relations.xml
@@ -171,7 +163,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves the route that was used.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return string The matched route.
 	 */
@@ -183,7 +174,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Sets the route (regex for path) that caused the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $route Route name.
 	 */
@@ -195,7 +185,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves the handler that was used to generate the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return null|array The handler that was used to create the response.
 	 */
@@ -207,7 +196,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves the handler that was responsible for generating the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $handler The matched handler.
 	 */
@@ -219,7 +207,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Checks if the response is an error, i.e. >= 400 response code.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return bool Whether the response is an error.
 	 */
@@ -231,7 +218,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves a WP_Error object from the response.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return WP_Error|null WP_Error or null on not an errored response.
 	 */
@@ -261,7 +247,6 @@ class WP_REST_Response extends WP_HTTP_Response {
 	 * Retrieves the CURIEs (compact URIs) used for relations.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return array Compact URIs.
 	 */
diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php
index 2ec8ccde23..548d6c17c4 100644
--- a/wp-includes/rest-api/class-wp-rest-server.php
+++ b/wp-includes/rest-api/class-wp-rest-server.php
@@ -58,7 +58,6 @@ class WP_REST_Server {
 	 * Namespaces registered to the server.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $namespaces = array();
@@ -67,7 +66,6 @@ class WP_REST_Server {
 	 * Endpoints registered to the server.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $endpoints = array();
@@ -76,7 +74,6 @@ class WP_REST_Server {
 	 * Options defined for the routes.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $route_options = array();
@@ -85,7 +82,6 @@ class WP_REST_Server {
 	 * Instantiates the REST server.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->endpoints = array(
@@ -107,7 +103,6 @@ class WP_REST_Server {
 	 * Checks the authentication headers if supplied.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return WP_Error|null WP_Error indicates unsuccessful login, null indicates successful
 	 *                       or no authentication provided
@@ -148,7 +143,6 @@ class WP_REST_Server {
 	 * list in JSON rather than an object/map.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @param WP_Error $error WP_Error instance.
 	 * @return WP_REST_Response List of associative arrays with code and message keys.
@@ -191,7 +185,6 @@ class WP_REST_Server {
 	 * a 'status' key, with the value being the HTTP status to send.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @param string $code    WP_Error-style code.
 	 * @param string $message Human-readable message.
@@ -215,7 +208,6 @@ class WP_REST_Server {
 	 * callback then outputs a JSON representation of the returned value.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @see WP_REST_Server::dispatch()
 	 *
@@ -425,7 +417,6 @@ class WP_REST_Server {
 	 * Converts a response to data to send.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_REST_Response $response Response object.
 	 * @param bool             $embed    Whether links should be embedded.
@@ -463,7 +454,6 @@ class WP_REST_Server {
 	 * direct output.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @static
 	 *
 	 * @param WP_REST_Response $response Response to extract links from.
@@ -497,7 +487,6 @@ class WP_REST_Server {
 	 * direct output.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 * @static
 	 *
 	 * @param WP_REST_Response $response Response to extract links from.
@@ -547,7 +536,6 @@ class WP_REST_Server {
 	 * Embeds the links from the data into the request.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @param array $data Data from the request.
 	 * @return array {
@@ -623,7 +611,6 @@ class WP_REST_Server {
 	 * data instead.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_REST_Response $response Response object.
 	 * @param bool             $embed    Whether links should be embedded.
@@ -654,7 +641,6 @@ class WP_REST_Server {
 	 * Registers a route to the server.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $namespace  Namespace.
 	 * @param string $route      The REST route.
@@ -709,7 +695,6 @@ class WP_REST_Server {
 	 * used as the delimiter with preg_match()
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array `'/path/regex' => array( $callback, $bitmask )` or
 	 *               `'/path/regex' => array( array( $callback, $bitmask ), ...)`.
@@ -784,7 +769,6 @@ class WP_REST_Server {
 	 * Retrieves namespaces registered on the server.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @return array List of registered namespaces.
 	 */
@@ -796,7 +780,6 @@ class WP_REST_Server {
 	 * Retrieves specified options for a route.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $route Route pattern to fetch options for.
 	 * @return array|null Data as an associative array if found, or null if not found.
@@ -813,7 +796,6 @@ class WP_REST_Server {
 	 * Matches the request to a callback and call it.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Request to attempt dispatching.
 	 * @return WP_REST_Response Response returned by the callback.
@@ -993,7 +975,6 @@ class WP_REST_Server {
 	 * "Encoding error: Maximum stack depth exceeded".
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @return bool|string Boolean false or string error message.
 	 */
@@ -1018,7 +999,6 @@ class WP_REST_Server {
 	 * This endpoint describes the capabilities of the site.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $request {
 	 *     Request.
@@ -1063,7 +1043,6 @@ class WP_REST_Server {
 	 * Retrieves the index for a namespace.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request REST request instance.
 	 * @return WP_REST_Response|WP_Error WP_REST_Response instance if the index was found,
@@ -1106,7 +1085,6 @@ class WP_REST_Server {
 	 * Retrieves the publicly-visible data for routes.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array  $routes  Routes to get data for.
 	 * @param string $context Optional. Context for data. Accepts 'view' or 'help'. Default 'view'.
@@ -1151,7 +1129,6 @@ class WP_REST_Server {
 	 * Retrieves publicly-visible data for the route.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $route     Route to get data for.
 	 * @param array  $callbacks Callbacks to convert to data.
@@ -1237,7 +1214,6 @@ class WP_REST_Server {
 	 * Sends an HTTP status code.
 	 *
 	 * @since 4.4.0
-	 * @access protected
 	 *
 	 * @param int $code HTTP status.
 	 */
@@ -1249,7 +1225,6 @@ class WP_REST_Server {
 	 * Sends an HTTP header.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param string $key Header key.
 	 * @param string $value Header value.
@@ -1270,7 +1245,6 @@ class WP_REST_Server {
 	 * Sends multiple HTTP headers.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
@@ -1284,7 +1258,6 @@ class WP_REST_Server {
 	 * Removes an HTTP header from the current response.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param string $key Header key.
 	 */
@@ -1308,7 +1281,6 @@ class WP_REST_Server {
 	 * Retrieves the raw request entity (body).
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @global string $HTTP_RAW_POST_DATA Raw post data.
 	 *
@@ -1332,7 +1304,6 @@ class WP_REST_Server {
 	 * Extracts headers from a PHP-style $_SERVER array.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $server Associative array similar to `$_SERVER`.
 	 * @return array Headers extracted from the input.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
index 43d057e167..76802fea76 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
@@ -21,7 +21,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * prepares for WP_Query.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array           $prepared_args Optional. Array of prepared arguments. Default empty array.
 	 * @param WP_REST_Request $request       Optional. Request to prepare items for.
@@ -59,7 +58,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Checks if a given request has access to create an attachment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|true Boolean true if the attachment may be created, or a WP_Error if not.
@@ -92,7 +90,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Creates a single attachment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, WP_Error object on failure.
@@ -200,7 +197,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Updates a single attachment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, WP_Error object on failure.
@@ -245,7 +241,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Prepares a single attachment for create or update.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_Error|stdClass $prepared_attachment Post object.
@@ -282,7 +277,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Prepares a single attachment output for response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Post         $post    Attachment object.
 	 * @param WP_REST_Request $request Request object.
@@ -375,7 +369,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Retrieves the attachment's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema as an array.
 	 */
@@ -481,7 +474,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Handles an upload via raw POST data.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array $data    Supplied file data.
 	 * @param array $headers HTTP headers from the request.
@@ -579,7 +571,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 *     ext-token           = <the characters in token, followed by "*">
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @link http://tools.ietf.org/html/rfc2388
 	 * @link http://tools.ietf.org/html/rfc6266
@@ -632,7 +623,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Retrieves the query params for collections of attachments.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Query parameters for the attachment collection as an array.
 	 */
@@ -662,7 +652,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Validates whether the user can query private statuses.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param mixed           $value     Status value.
 	 * @param WP_REST_Request $request   Request object.
@@ -681,7 +670,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Handles an upload via multipart/form-data ($_FILES).
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array $files   Data from the `$_FILES` superglobal.
 	 * @param array $headers HTTP headers from the request.
@@ -731,7 +719,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * Media types are considered the MIME type category.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return array Array of supported media types.
 	 */
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
index 4ed2026dcb..e91fce209f 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-comments-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Instance of a comment meta fields object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var WP_REST_Comment_Meta_Fields
 	 */
 	protected $meta;
@@ -29,7 +28,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -42,7 +40,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function register_routes() {
 
@@ -111,7 +108,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read comments.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has read access, error object otherwise.
@@ -164,7 +160,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Retrieves a list of comment items.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or error object on failure.
@@ -339,7 +334,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read the comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has read access for the item, error object otherwise.
@@ -371,7 +365,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Retrieves a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or error object on failure.
@@ -392,7 +385,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to create a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has access to create items, error object otherwise.
@@ -480,7 +472,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Creates a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or error object on failure.
@@ -648,7 +639,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a given REST request has access to update a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has access to update the item, error object otherwise.
@@ -670,7 +660,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Updates a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or error object on failure.
@@ -767,7 +756,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to delete a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has access to delete the item, error object otherwise.
@@ -788,7 +776,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Deletes a comment.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or error object on failure.
@@ -857,7 +844,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Prepares a single comment output for response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Comment      $comment Comment object.
 	 * @param WP_REST_Request $request Request object.
@@ -923,7 +909,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Prepares links for the request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_Comment $comment Comment object.
 	 * @return array Links for the given comment.
@@ -992,7 +977,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Prepends internal property prefix to query parameters to match our response fields.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string $query_param Query parameter.
 	 * @return string The normalized query parameter.
@@ -1025,7 +1009,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks comment_approved to set comment status for single comment output.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string|int $comment_approved comment status.
 	 * @return string Comment status.
@@ -1057,7 +1040,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Prepares a single comment to be inserted into the database.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return array|WP_Error Prepared comment, otherwise WP_Error object.
@@ -1153,7 +1135,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Retrieves the comment's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array
 	 */
@@ -1313,7 +1294,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Comments collection parameters.
 	 */
@@ -1471,7 +1451,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Sets the comment_status of a given comment object when creating or updating a comment.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string|int $new_status New comment status.
 	 * @param int        $comment_id Comment ID.
@@ -1520,7 +1499,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Correctly handles posts with the inherit status.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_Post         $post    Post object.
 	 * @param WP_REST_Request $request Request data to check.
@@ -1558,7 +1536,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if the comment can be read.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_Comment      $comment Comment object.
 	 * @param WP_REST_Request $request Request data to check.
@@ -1593,7 +1570,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * Checks if a comment can be edited or deleted.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $comment Comment object.
 	 * @return bool Whether the comment can be edited or deleted.
@@ -1618,7 +1594,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 * string is allowed when a comment is being updated.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string          $value   Author email value submitted.
 	 * @param WP_REST_Request $request Full details about the request.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
index b6c8ac42ac..e04193a511 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
@@ -18,7 +18,6 @@ abstract class WP_REST_Controller {
 	 * The namespace of this controller's route.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $namespace;
@@ -27,7 +26,6 @@ abstract class WP_REST_Controller {
 	 * The base of this controller's route.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $rest_base;
@@ -36,7 +34,6 @@ abstract class WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function register_routes() {
 		_doing_it_wrong( 'WP_REST_Controller::register_routes', __( 'The register_routes() method must be overridden' ), '4.7' );
@@ -46,7 +43,6 @@ abstract class WP_REST_Controller {
 	 * Checks if a given request has access to get items.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|bool True if the request has read access, WP_Error object otherwise.
@@ -59,7 +55,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves a collection of items.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -72,7 +67,6 @@ abstract class WP_REST_Controller {
 	 * Checks if a given request has access to get a specific item.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|bool True if the request has read access for the item, WP_Error object otherwise.
@@ -85,7 +79,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves one item from the collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -98,7 +91,6 @@ abstract class WP_REST_Controller {
 	 * Checks if a given request has access to create items.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|bool True if the request has access to create items, WP_Error object otherwise.
@@ -111,7 +103,6 @@ abstract class WP_REST_Controller {
 	 * Creates one item from the collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -124,7 +115,6 @@ abstract class WP_REST_Controller {
 	 * Checks if a given request has access to update a specific item.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|bool True if the request has access to update the item, WP_Error object otherwise.
@@ -137,7 +127,6 @@ abstract class WP_REST_Controller {
 	 * Updates one item from the collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -150,7 +139,6 @@ abstract class WP_REST_Controller {
 	 * Checks if a given request has access to delete a specific item.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|bool True if the request has access to delete the item, WP_Error object otherwise.
@@ -163,7 +151,6 @@ abstract class WP_REST_Controller {
 	 * Deletes one item from the collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -176,7 +163,6 @@ abstract class WP_REST_Controller {
 	 * Prepares one item for create or update operation.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_Error|object The prepared item, or WP_Error object on failure.
@@ -189,7 +175,6 @@ abstract class WP_REST_Controller {
 	 * Prepares the item for the REST response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param mixed           $item    WordPress representation of the item.
 	 * @param WP_REST_Request $request Request object.
@@ -203,7 +188,6 @@ abstract class WP_REST_Controller {
 	 * Prepares a response for insertion into a collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Response $response Response object.
 	 * @return array|mixed Response data, ready for insertion into collection data.
@@ -233,7 +217,6 @@ abstract class WP_REST_Controller {
 	 * Filters a response based on the context defined in the schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array  $data    Response data to fiter.
 	 * @param string $context Context defined in the schema.
@@ -275,7 +258,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves the item's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -287,7 +269,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves the item's schema for display / public consumption purposes.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Public item schema data.
 	 */
@@ -306,7 +287,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves the query params for the collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Query parameters for the collection.
 	 */
@@ -345,7 +325,6 @@ abstract class WP_REST_Controller {
 	 * Ensures consistent descriptions between endpoints, and populates enum from schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array $args Optional. Additional arguments for context parameter. Default empty array.
 	 * @return array Context parameter details.
@@ -384,7 +363,6 @@ abstract class WP_REST_Controller {
 	 * Adds the values from additional fields to a data object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array           $object  Data object.
 	 * @param WP_REST_Request $request Full details about the request.
@@ -410,7 +388,6 @@ abstract class WP_REST_Controller {
 	 * Updates the values of additional fields added to a data object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array           $object  Data Object.
 	 * @param WP_REST_Request $request Full details about the request.
@@ -445,7 +422,6 @@ abstract class WP_REST_Controller {
 	 * The type of object is inferred from the passed schema.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array $schema Schema array.
 	 * @return array Modified Schema array.
@@ -475,7 +451,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves all of the registered additional fields for a given object-type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param  string $object_type Optional. The object type.
 	 * @return array Registered additional fields (if any), empty array if none or if the object type could
@@ -504,7 +479,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves the object type this controller is responsible for managing.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string Object type for the controller.
 	 */
@@ -522,7 +496,6 @@ abstract class WP_REST_Controller {
 	 * Retrieves an array of endpoint arguments from the item schema for the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $method Optional. HTTP method of the request. The arguments for `CREATABLE` requests are
 	 *                       checked for required values and may fall-back to a given default, this is not done
@@ -584,7 +557,6 @@ abstract class WP_REST_Controller {
 	 * Sanitizes the slug value.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @internal We can't use sanitize_title() directly, as the second
 	 * parameter is the fallback title, which would end up being set to the
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
index 59575d566c..369cf3c757 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -31,7 +30,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -70,7 +68,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Checks whether a given request has permission to read post statuses.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has read access, WP_Error object otherwise.
@@ -94,7 +91,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Retrieves all post statuses, depending on user context.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -122,7 +118,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read a post status.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|bool True if the request has read access for the item, WP_Error object otherwise.
@@ -147,7 +142,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Checks whether a given post status should be visible.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $status Post status.
 	 * @return bool True if the post status is visible, otherwise false.
@@ -174,7 +168,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Retrieves a specific post status.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -195,7 +188,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Prepares a post status object for serialization.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param stdClass        $status  Post status data.
 	 * @param WP_REST_Request $request Full details about the request.
@@ -243,7 +235,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Retrieves the post status' schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -305,7 +296,6 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
index 69d221be75..c4571d9721 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-post-types-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -31,7 +30,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -69,7 +67,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Checks whether a given request has permission to read types.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|true True if the request has read access, WP_Error object otherwise.
@@ -92,7 +89,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Retrieves all public post types.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -116,7 +112,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Retrieves a specific post type.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -145,7 +140,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Prepares a post type object for serialization.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param stdClass        $post_type Post type data.
 	 * @param WP_REST_Request $request   Full details about the request.
@@ -202,7 +196,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Retrieves the post type's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -278,7 +271,6 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index 39593cbe3e..417dce0288 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Post type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $post_type;
@@ -29,7 +28,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Instance of a post meta fields object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var WP_REST_Post_Meta_Fields
 	 */
 	protected $meta;
@@ -38,7 +36,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $post_type Post type.
 	 */
@@ -55,7 +52,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -126,7 +122,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read posts.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
@@ -146,7 +141,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Retrieves a collection of posts.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -389,7 +383,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read a post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object otherwise.
@@ -430,7 +423,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * check in core with a filter.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Post         $post    Post to check against.
 	 * @param WP_REST_Request $request Request data to check.
@@ -460,7 +452,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Retrieves a single post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -485,7 +476,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to create a post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
@@ -520,7 +510,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Creates a single post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -624,7 +613,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to update a post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
@@ -660,7 +648,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Updates a single post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -748,7 +735,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to delete a post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
@@ -770,7 +756,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Deletes a single post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -860,7 +845,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * them for WP_Query.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param array           $prepared_args Optional. Prepared WP_Query arguments. Default empty array.
 	 * @param WP_REST_Request $request       Optional. Full details about the request.
@@ -907,7 +891,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * modified date for single post output.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string      $date_gmt GMT publication time.
 	 * @param string|null $date     Optional. Local publication time. Default null.
@@ -932,7 +915,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Prepares a single post for create or update.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return stdClass|WP_Error Post object or WP_Error.
@@ -1106,7 +1088,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Determines validity and normalizes the given status parameter.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string $post_status Post status.
 	 * @param object $post_type   Post type.
@@ -1143,7 +1124,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Determines the featured media based on a request param.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int $featured_media Featured Media ID.
 	 * @param int $post_id        Post ID.
@@ -1169,7 +1149,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Sets the template for a post.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string  $template Page template filename.
 	 * @param integer $post_id  Post ID.
@@ -1186,7 +1165,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Updates the post's terms from a REST request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int             $post_id The post ID to update the terms form.
 	 * @param WP_REST_Request $request The request object with post and terms data.
@@ -1214,7 +1192,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks whether current user can assign all terms sent with the current request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_REST_Request $request The request object with post and terms data.
 	 * @return bool Whether the current user can assign the provided terms.
@@ -1247,7 +1224,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a given post type can be viewed or managed.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object|string $post_type Post type name or object.
 	 * @return bool Whether the post type is allowed in REST.
@@ -1270,7 +1246,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Correctly handles posts with the inherit status.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param object $post Post object.
 	 * @return bool Whether the post can be read.
@@ -1314,7 +1289,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a post can be edited.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $post Post object.
 	 * @return bool Whether the post can be edited.
@@ -1333,7 +1307,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a post can be created.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $post Post object.
 	 * @return bool Whether the post can be created.
@@ -1352,7 +1325,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Checks if a post can be deleted.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $post Post object.
 	 * @return bool Whether the post can be deleted.
@@ -1371,7 +1343,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Prepares a single post output for response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Post         $post    Post object.
 	 * @param WP_REST_Request $request Request object.
@@ -1588,7 +1559,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * in a machine readable format, we remove the "Protected: " prefix.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string Protected title format.
 	 */
@@ -1600,7 +1570,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Prepares links for the request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_Post $post Post object.
 	 * @return array Links for the given post.
@@ -1709,7 +1678,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Retrieves the post's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -2048,7 +2016,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for the posts collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
@@ -2243,7 +2210,6 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 * user can query private statuses.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  string|array    $statuses  One or more post statuses.
 	 * @param  WP_REST_Request $request   Full details about the request.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
index 8b0efcdf3d..16da36bc42 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Parent post type.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var string
 	 */
 	private $parent_post_type;
@@ -29,7 +28,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Parent controller.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var WP_REST_Controller
 	 */
 	private $parent_controller;
@@ -38,7 +36,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * The base of the parent controller's route.
 	 *
 	 * @since 4.7.0
-	 * @access private
 	 * @var string
 	 */
 	private $parent_base;
@@ -47,7 +44,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $parent_post_type Post type of the parent.
 	 */
@@ -64,7 +60,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Registers routes for revisions based on post types supporting revisions.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -148,7 +143,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to get revisions.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
@@ -193,7 +187,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Gets a collection of revisions.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -218,7 +211,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to get a specific revision.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return bool|WP_Error True if the request has read access for the item, WP_Error object otherwise.
@@ -231,7 +223,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Retrieves one revision from the collection.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full data about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -255,7 +246,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to delete a revision.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
@@ -284,7 +274,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Deletes a single revision.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True on success, or WP_Error object on failure.
@@ -331,7 +320,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Prepares the revision for the REST response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_Post         $post    Post revision object.
 	 * @param WP_REST_Request $request Request object.
@@ -437,7 +425,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * modified date for single post output.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string      $date_gmt GMT publication time.
 	 * @param string|null $date     Optional. Local publication time. Default null.
@@ -459,7 +446,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Retrieves the revision's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -547,7 +533,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
@@ -561,7 +546,6 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * Checks the post excerpt and prepare it for single post output.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string  $excerpt The post excerpt.
 	 * @param WP_Post $post    Post revision object.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
index 57954f1b52..17a01b8ba6 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-settings-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -31,7 +30,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -59,7 +57,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read and manage settings.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool True if the request has read access for the item, otherwise false.
@@ -72,7 +69,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Retrieves the settings.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array|WP_Error Array on success, or WP_Error object on failure.
@@ -117,7 +113,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Prepares a value for output based off a schema array.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param mixed $value  Value to prepare.
 	 * @param array $schema Schema to match.
@@ -147,7 +142,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Updates settings for the settings object.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return array|WP_Error Array on success, or error object on failure.
@@ -217,7 +211,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Retrieves all of the registered options for the Settings API.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return array Array of registered options.
 	 */
@@ -274,7 +267,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * Retrieves the site setting schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -306,7 +298,6 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 * provide a wrapper sanitizer to whitelist the use of `null`.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  mixed           $value   The value for the setting.
 	 * @param  WP_REST_Request $request The request object.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
index b46562c9c4..ea97135677 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-taxonomies-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -31,7 +30,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -70,7 +68,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Checks whether a given request has permission to read taxonomies.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
@@ -96,7 +93,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Retrieves all public taxonomies.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response Response object on success, or WP_Error object on failure.
@@ -133,7 +129,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access for the item, otherwise false or WP_Error object.
@@ -158,7 +153,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Retrieves a specific taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -176,7 +170,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Prepares a taxonomy object for serialization.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param stdClass        $taxonomy Taxonomy data.
 	 * @param WP_REST_Request $request  Full details about the request.
@@ -230,7 +223,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Retrieves the taxonomy's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -306,7 +298,6 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
index 299b034329..0723022035 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-terms-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Taxonomy key.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $taxonomy;
@@ -29,7 +28,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Instance of a term meta fields object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var WP_REST_Term_Meta_Fields
 	 */
 	protected $meta;
@@ -38,7 +36,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Column to have the terms be sorted by.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $sort_column;
@@ -47,7 +44,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Number of terms that were found.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var int
 	 */
 	protected $total_terms;
@@ -56,7 +52,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $taxonomy Taxonomy key.
 	 */
@@ -73,7 +68,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -136,7 +130,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks if a request has access to read terms in the specified taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access, otherwise false or WP_Error object.
@@ -156,7 +149,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Retrieves terms associated with a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -324,7 +316,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks if a request has access to read or edit the specified term.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has read access for the item, otherwise false or WP_Error object.
@@ -345,7 +336,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Gets a single term from a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -365,7 +355,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks if a request has access to create a term.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has access to create items, false or WP_Error object otherwise.
@@ -388,7 +377,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Creates a single term in a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -467,7 +455,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks if a request has access to update the specified term.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has access to update the item, false or WP_Error object otherwise.
@@ -489,7 +476,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Updates a single term from a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -554,7 +540,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks if a request has access to delete the specified term.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return bool|WP_Error True if the request has access to delete the item, otherwise false or WP_Error object.
@@ -576,7 +561,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Deletes a single term from a taxonomy.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -627,7 +611,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Prepares a single term for create or update.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return object $prepared_term Term object.
@@ -680,7 +663,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Prepares a single term output for response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param obj             $item    Term object.
 	 * @param WP_REST_Request $request Request object.
@@ -755,7 +737,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Prepares links for the request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param object $term Term object.
 	 * @return array Links for the given term.
@@ -817,7 +798,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Retrieves the term's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -897,7 +877,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
@@ -1006,7 +985,6 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * Checks that the taxonomy is valid.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param string $taxonomy Taxonomy to check.
 	 * @return bool Whether the taxonomy is allowed for REST management.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
index 63fb4e9e99..5afe3a2264 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
@@ -20,7 +20,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Instance of a user meta fields object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var WP_REST_User_Meta_Fields
 	 */
 	protected $meta;
@@ -29,7 +28,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 */
 	public function __construct() {
 		$this->namespace = 'wp/v2';
@@ -42,7 +40,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_route()
 	 */
@@ -148,7 +145,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * The value can be an integer, 'false', false, or ''.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param int|bool        $value   The value passed to the reassign parameter.
 	 * @param WP_REST_Request $request Full details about the request.
@@ -172,7 +168,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Permissions check for getting all users.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access, otherwise WP_Error object.
@@ -198,7 +193,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Retrieves all users.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -357,7 +351,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to read a user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has read access for the item, otherwise WP_Error object.
@@ -387,7 +380,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Retrieves a single user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -408,7 +400,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Retrieves the current user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -432,7 +423,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access create users.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to create items, WP_Error object otherwise.
@@ -450,7 +440,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Creates a single user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -559,7 +548,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to update a user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
@@ -585,7 +573,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Updates a single user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -671,7 +658,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to update the current user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to update the item, WP_Error object otherwise.
@@ -686,7 +672,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Updates the current user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -701,7 +686,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access delete a user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
@@ -723,7 +707,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Deletes a single user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -787,7 +770,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Checks if a given request has access to delete the current user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return true|WP_Error True if the request has access to delete the item, WP_Error object otherwise.
@@ -802,7 +784,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Deletes the current user.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
@@ -817,7 +798,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Prepares a single user output for response.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param WP_User         $user    User object.
 	 * @param WP_REST_Request $request Request object.
@@ -927,7 +907,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Prepares links for the user request.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_Post $user User object.
 	 * @return array Links for the given user.
@@ -949,7 +928,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Prepares a single user for creation or update.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param WP_REST_Request $request Request object.
 	 * @return object $prepared_user User object.
@@ -1029,7 +1007,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Determines if the current user is allowed to make the desired roles change.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param integer $user_id User ID.
 	 * @param array   $roles   New user roles.
@@ -1080,7 +1057,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Performs a couple of checks like edit_user() in wp-admin/includes/user.php.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  mixed            $value   The username submitted in the request.
 	 * @param  WP_REST_Request  $request Full details about the request.
@@ -1110,7 +1086,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Performs a couple of checks like edit_user() in wp-admin/includes/user.php.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  mixed            $value   The password submitted in the request.
 	 * @param  WP_REST_Request  $request Full details about the request.
@@ -1135,7 +1110,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Retrieves the user's schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Item schema data.
 	 */
@@ -1303,7 +1277,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 * Retrieves the query params for collections.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return array Collection parameters.
 	 */
diff --git a/wp-includes/rest-api/fields/class-wp-rest-comment-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-comment-meta-fields.php
index 007f66b6c0..b22206953a 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-comment-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-comment-meta-fields.php
@@ -20,7 +20,6 @@ class WP_REST_Comment_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the object type for comment meta.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string The meta type.
 	 */
@@ -32,7 +31,6 @@ class WP_REST_Comment_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the type for register_rest_field() in the context of comments.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string The REST field type.
 	 */
diff --git a/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
index eaf70a5781..9288c0a284 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-meta-fields.php
@@ -18,7 +18,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Retrieves the object meta type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string One of 'post', 'comment', 'term', 'user', or anything
 	 *                else supported by `_get_meta_table()`.
@@ -29,7 +28,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Retrieves the object type for register_rest_field().
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string The REST field type, such as post type name, taxonomy name, 'comment', or `user`.
 	 */
@@ -39,7 +37,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Registers the meta field.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_field()
 	 */
@@ -55,7 +52,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Retrieves the meta field value.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param int             $object_id Object ID to fetch meta for.
 	 * @param WP_REST_Request $request   Full details about the request.
@@ -96,7 +92,6 @@ abstract class WP_REST_Meta_Fields {
 	 * type before passing back to JSON.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param mixed           $value   Meta value to prepare.
 	 * @param WP_REST_Request $request Current request object.
@@ -115,7 +110,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Updates meta values.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param array           $meta      Array of meta parsed from the request.
 	 * @param int             $object_id Object ID to fetch meta for.
@@ -167,7 +161,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Deletes a meta value for an object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int    $object_id Object ID the field belongs to.
 	 * @param string $meta_key  Key for the field.
@@ -202,7 +195,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Alters the list of values in the database to match the list of provided values.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int    $object_id Object ID to update.
 	 * @param string $meta_key  Key for the custom field.
@@ -274,7 +266,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Updates a meta value for an object.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @param int    $object_id Object ID to update.
 	 * @param string $meta_key  Key for the custom field.
@@ -320,7 +311,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Retrieves all the registered meta fields.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return array Registered fields.
 	 */
@@ -379,7 +369,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Retrieves the object's meta schema, conforming to JSON Schema.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return array Field schema data.
 	 */
@@ -411,7 +400,6 @@ abstract class WP_REST_Meta_Fields {
 	 * `prepare_callback` in your `show_in_rest` options.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param mixed           $value   Meta value from the database.
 	 * @param WP_REST_Request $request Request object.
@@ -453,7 +441,6 @@ abstract class WP_REST_Meta_Fields {
 	 * Check the 'meta' value of a request is an associative array.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param  mixed           $value   The meta value submitted in the request.
 	 * @param  WP_REST_Request $request Full details about the request.
diff --git a/wp-includes/rest-api/fields/class-wp-rest-post-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-post-meta-fields.php
index 17d87fa44f..e15364246e 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-post-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-post-meta-fields.php
@@ -20,7 +20,6 @@ class WP_REST_Post_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Post type to register fields for.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $post_type;
@@ -29,7 +28,6 @@ class WP_REST_Post_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $post_type Post type to register fields for.
 	 */
@@ -41,7 +39,6 @@ class WP_REST_Post_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the object meta type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string The meta type.
 	 */
@@ -53,7 +50,6 @@ class WP_REST_Post_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the type for register_rest_field().
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @see register_rest_field()
 	 *
diff --git a/wp-includes/rest-api/fields/class-wp-rest-term-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-term-meta-fields.php
index da1349b6a5..aa876ccb8e 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-term-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-term-meta-fields.php
@@ -20,7 +20,6 @@ class WP_REST_Term_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Taxonomy to register fields for.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $taxonomy;
@@ -29,7 +28,6 @@ class WP_REST_Term_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Constructor.
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @param string $taxonomy Taxonomy to register fields for.
 	 */
@@ -41,7 +39,6 @@ class WP_REST_Term_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the object meta type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string The meta type.
 	 */
@@ -53,7 +50,6 @@ class WP_REST_Term_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the type for register_rest_field().
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string The REST field type.
 	 */
diff --git a/wp-includes/rest-api/fields/class-wp-rest-user-meta-fields.php b/wp-includes/rest-api/fields/class-wp-rest-user-meta-fields.php
index dcc9be6727..6c5494f521 100644
--- a/wp-includes/rest-api/fields/class-wp-rest-user-meta-fields.php
+++ b/wp-includes/rest-api/fields/class-wp-rest-user-meta-fields.php
@@ -20,7 +20,6 @@ class WP_REST_User_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the object meta type.
 	 *
 	 * @since 4.7.0
-	 * @access protected
 	 *
 	 * @return string The user meta type.
 	 */
@@ -32,7 +31,6 @@ class WP_REST_User_Meta_Fields extends WP_REST_Meta_Fields {
 	 * Retrieves the type for register_rest_field().
 	 *
 	 * @since 4.7.0
-	 * @access public
 	 *
 	 * @return string The user REST field type.
 	 */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index dedf160b39..ceb7526645 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-41161';
+$wp_version = '4.9-alpha-41162';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets/class-wp-nav-menu-widget.php b/wp-includes/widgets/class-wp-nav-menu-widget.php
index d7ad82b7e8..1674fa8606 100644
--- a/wp-includes/widgets/class-wp-nav-menu-widget.php
+++ b/wp-includes/widgets/class-wp-nav-menu-widget.php
@@ -20,7 +20,6 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 * Sets up a new Custom Menu widget instance.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -34,7 +33,6 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 * Outputs the content for the current Custom Menu widget instance.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -85,7 +83,6 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 * Handles updating settings for the current Custom Menu widget instance.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -107,7 +104,6 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 * Outputs the settings form for the Custom Menu widget.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 * @global WP_Customize_Manager $wp_customize
diff --git a/wp-includes/widgets/class-wp-widget-archives.php b/wp-includes/widgets/class-wp-widget-archives.php
index f36b47ee8e..632193d0dd 100644
--- a/wp-includes/widgets/class-wp-widget-archives.php
+++ b/wp-includes/widgets/class-wp-widget-archives.php
@@ -20,7 +20,6 @@ class WP_Widget_Archives extends WP_Widget {
 	 * Sets up a new Archives widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -35,7 +34,6 @@ class WP_Widget_Archives extends WP_Widget {
 	 * Outputs the content for the current Archives widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -125,7 +123,6 @@ class WP_Widget_Archives extends WP_Widget {
 	 * Handles updating settings for the current Archives widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget_Archives::form().
@@ -146,7 +143,6 @@ class WP_Widget_Archives extends WP_Widget {
 	 * Outputs the settings form for the Archives widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-calendar.php b/wp-includes/widgets/class-wp-widget-calendar.php
index 99696780f1..6c59ad1b80 100644
--- a/wp-includes/widgets/class-wp-widget-calendar.php
+++ b/wp-includes/widgets/class-wp-widget-calendar.php
@@ -21,7 +21,6 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * @since 4.4.0
 	 *
 	 * @static
-	 * @access private
 	 * @var int
 	 */
 	private static $instance = 0;
@@ -30,7 +29,6 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * Sets up a new Calendar widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -45,7 +43,6 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * Outputs the content for the current Calendar widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -75,7 +72,6 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * Handles updating settings for the current Calendar widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -93,7 +89,6 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * Outputs the settings form for the Calendar widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php
index 2e52423d12..41906a7580 100644
--- a/wp-includes/widgets/class-wp-widget-categories.php
+++ b/wp-includes/widgets/class-wp-widget-categories.php
@@ -20,7 +20,6 @@ class WP_Widget_Categories extends WP_Widget {
 	 * Sets up a new Categories widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -35,7 +34,6 @@ class WP_Widget_Categories extends WP_Widget {
 	 * Outputs the content for the current Categories widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -124,7 +122,6 @@ class WP_Widget_Categories extends WP_Widget {
 	 * Handles updating settings for the current Categories widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -145,7 +142,6 @@ class WP_Widget_Categories extends WP_Widget {
 	 * Outputs the settings form for the Categories widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-links.php b/wp-includes/widgets/class-wp-widget-links.php
index b3bda4cef5..736abd968a 100644
--- a/wp-includes/widgets/class-wp-widget-links.php
+++ b/wp-includes/widgets/class-wp-widget-links.php
@@ -20,7 +20,6 @@ class WP_Widget_Links extends WP_Widget {
 	 * Sets up a new Links widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -34,7 +33,6 @@ class WP_Widget_Links extends WP_Widget {
 	 * Outputs the content for the current Links widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -86,7 +84,6 @@ class WP_Widget_Links extends WP_Widget {
 	 * Handles updating settings for the current Links widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -115,7 +112,6 @@ class WP_Widget_Links extends WP_Widget {
 	 * Outputs the settings form for the Links widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-media-audio.php b/wp-includes/widgets/class-wp-widget-media-audio.php
index c6f8c53e9e..cfabe8c6a4 100644
--- a/wp-includes/widgets/class-wp-widget-media-audio.php
+++ b/wp-includes/widgets/class-wp-widget-media-audio.php
@@ -20,7 +20,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * Constructor.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		parent::__construct( 'media_audio', __( 'Audio' ), array(
@@ -49,7 +48,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * Get schema for properties of a widget instance (item).
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @see WP_REST_Controller::get_item_schema()
 	 * @see WP_REST_Controller::get_additional_fields()
@@ -91,7 +89,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * Render the media on the frontend.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @param array $instance Widget instance props.
 	 * @return void
@@ -127,7 +124,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * case a widget does get added.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_preview_scripts() {
 		/** This filter is documented in wp-includes/media.php */
@@ -141,7 +137,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * Loads the required media files for the media manager and scripts for media widgets.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_admin_scripts() {
 		parent::enqueue_admin_scripts();
@@ -183,7 +178,6 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * Render form template scripts.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function render_control_template_scripts() {
 		parent::render_control_template_scripts()
diff --git a/wp-includes/widgets/class-wp-widget-media-image.php b/wp-includes/widgets/class-wp-widget-media-image.php
index 22e891f02a..40485a595d 100644
--- a/wp-includes/widgets/class-wp-widget-media-image.php
+++ b/wp-includes/widgets/class-wp-widget-media-image.php
@@ -20,7 +20,6 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * Constructor.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		parent::__construct( 'media_image', __( 'Image' ), array(
@@ -48,7 +47,6 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * Get schema for properties of a widget instance (item).
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @see WP_REST_Controller::get_item_schema()
 	 * @see WP_REST_Controller::get_additional_fields()
@@ -164,7 +162,6 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * Render the media on the frontend.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @param array $instance Widget instance props.
 	 * @return void
@@ -267,7 +264,6 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * Loads the required media files for the media manager and scripts for media widgets.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_admin_scripts() {
 		parent::enqueue_admin_scripts();
@@ -306,7 +302,6 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * Render form template scripts.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function render_control_template_scripts() {
 		parent::render_control_template_scripts();
diff --git a/wp-includes/widgets/class-wp-widget-media-video.php b/wp-includes/widgets/class-wp-widget-media-video.php
index f05928f636..ee685f4223 100644
--- a/wp-includes/widgets/class-wp-widget-media-video.php
+++ b/wp-includes/widgets/class-wp-widget-media-video.php
@@ -20,7 +20,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Constructor.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		parent::__construct( 'media_video', __( 'Video' ), array(
@@ -50,7 +49,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Get schema for properties of a widget instance (item).
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @see WP_REST_Controller::get_item_schema()
 	 * @see WP_REST_Controller::get_additional_fields()
@@ -101,7 +99,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Render the media on the frontend.
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @param array $instance Widget instance props.
 	 *
@@ -141,7 +138,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Inject max-width and remove height for videos too constrained to fit inside sidebars on frontend.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param string $html Video shortcode HTML output.
 	 * @return string HTML Output.
@@ -162,7 +158,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * case a widget does get added.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_preview_scripts() {
 		/** This filter is documented in wp-includes/media.php */
@@ -179,7 +174,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Loads the required scripts and styles for the widget control.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_admin_scripts() {
 		parent::enqueue_admin_scripts();
@@ -218,7 +212,6 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * Render form template scripts.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function render_control_template_scripts() {
 		parent::render_control_template_scripts()
diff --git a/wp-includes/widgets/class-wp-widget-media.php b/wp-includes/widgets/class-wp-widget-media.php
index 10f92abcea..59afe7d082 100644
--- a/wp-includes/widgets/class-wp-widget-media.php
+++ b/wp-includes/widgets/class-wp-widget-media.php
@@ -45,7 +45,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Constructor.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param string $id_base         Base ID for the widget, lowercase and unique.
 	 * @param string $name            Name for the widget displayed on the configuration page.
@@ -93,7 +92,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Add hooks while registering all widget instances of this widget class.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param integer $number Optional. The unique order number of this widget instance
 	 *                        compared to other instances of the same class. Default -1.
@@ -122,7 +120,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Get schema for properties of a widget instance (item).
 	 *
 	 * @since  4.8.0
-	 * @access public
 	 *
 	 * @see WP_REST_Controller::get_item_schema()
 	 * @see WP_REST_Controller::get_additional_fields()
@@ -158,7 +155,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Determine if the supplied attachment is for a valid attachment post with the specified MIME type.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param int|WP_Post $attachment Attachment post ID or object.
 	 * @param string      $mime_type  MIME type.
@@ -182,7 +178,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Sanitize a token list string, such as used in HTML rel and class attributes.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @link http://w3c.github.io/html/infrastructure.html#space-separated-tokens
 	 * @link https://developer.mozilla.org/en-US/docs/Web/API/DOMTokenList
@@ -202,7 +197,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Displays the widget on the front-end.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @see WP_Widget::widget()
 	 *
@@ -246,7 +240,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Sanitizes the widget form values as they are saved.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @see WP_Widget::update()
 	 * @see WP_REST_Request::has_valid_params()
@@ -292,7 +285,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Render the media on the frontend.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param array $instance Widget instance props.
 	 * @return string
@@ -305,7 +297,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Note that the widget UI itself is rendered with JavaScript via `MediaWidgetControl#render()`.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @see \WP_Widget_Media::render_control_template_scripts() Where the JS template is located.
 	 * @param array $instance Current settings.
@@ -335,7 +326,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Filters the default media display states for items in the Media list table.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 *
 	 * @param array   $states An array of media states.
 	 * @param WP_Post $post   The current attachment object.
@@ -372,7 +362,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * case a widget does get added.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_preview_scripts() {}
 
@@ -380,7 +369,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Loads the required scripts and styles for the widget control.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_admin_scripts() {
 		wp_enqueue_media();
@@ -391,7 +379,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Render form template scripts.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function render_control_template_scripts() {
 		?>
@@ -425,7 +412,6 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * Whether the widget has content to show.
 	 *
 	 * @since 4.8.0
-	 * @access protected
 	 *
 	 * @param array $instance Widget instance props.
 	 * @return bool Whether widget has content.
diff --git a/wp-includes/widgets/class-wp-widget-meta.php b/wp-includes/widgets/class-wp-widget-meta.php
index e4a3b51ac9..237e09160a 100644
--- a/wp-includes/widgets/class-wp-widget-meta.php
+++ b/wp-includes/widgets/class-wp-widget-meta.php
@@ -22,7 +22,6 @@ class WP_Widget_Meta extends WP_Widget {
 	 * Sets up a new Meta widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -37,7 +36,6 @@ class WP_Widget_Meta extends WP_Widget {
 	 * Outputs the content for the current Meta widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -82,7 +80,6 @@ class WP_Widget_Meta extends WP_Widget {
 	 * Handles updating settings for the current Meta widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -100,7 +97,6 @@ class WP_Widget_Meta extends WP_Widget {
 	 * Outputs the settings form for the Meta widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-pages.php b/wp-includes/widgets/class-wp-widget-pages.php
index 9fd2afc573..d584e029ab 100644
--- a/wp-includes/widgets/class-wp-widget-pages.php
+++ b/wp-includes/widgets/class-wp-widget-pages.php
@@ -20,7 +20,6 @@ class WP_Widget_Pages extends WP_Widget {
 	 * Sets up a new Pages widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -35,7 +34,6 @@ class WP_Widget_Pages extends WP_Widget {
 	 * Outputs the content for the current Pages widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -94,7 +92,6 @@ class WP_Widget_Pages extends WP_Widget {
 	 * Handles updating settings for the current Pages widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -119,7 +116,6 @@ class WP_Widget_Pages extends WP_Widget {
 	 * Outputs the settings form for the Pages widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-recent-comments.php b/wp-includes/widgets/class-wp-widget-recent-comments.php
index fb78e88c79..484d0e7d54 100644
--- a/wp-includes/widgets/class-wp-widget-recent-comments.php
+++ b/wp-includes/widgets/class-wp-widget-recent-comments.php
@@ -20,7 +20,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Sets up a new Recent Comments widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -40,7 +39,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Outputs the default styles for the Recent Comments widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function recent_comments_style() {
 		/**
@@ -63,7 +61,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Outputs the content for the current Recent Comments widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -130,7 +127,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Handles updating settings for the current Recent Comments widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -148,7 +144,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Outputs the settings form for the Recent Comments widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
@@ -168,7 +163,6 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * Flushes the Recent Comments widget cache.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @deprecated 4.4.0 Fragment caching was removed in favor of split queries.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-recent-posts.php b/wp-includes/widgets/class-wp-widget-recent-posts.php
index 6e21d07691..2c111f931d 100644
--- a/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/wp-includes/widgets/class-wp-widget-recent-posts.php
@@ -20,7 +20,6 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 * Sets up a new Recent Posts widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -36,7 +35,6 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 * Outputs the content for the current Recent Posts widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -101,7 +99,6 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 * Handles updating the settings for the current Recent Posts widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -120,7 +117,6 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 * Outputs the settings form for the Recent Posts widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-rss.php b/wp-includes/widgets/class-wp-widget-rss.php
index a2548c4e1a..1a3b88777f 100644
--- a/wp-includes/widgets/class-wp-widget-rss.php
+++ b/wp-includes/widgets/class-wp-widget-rss.php
@@ -20,7 +20,6 @@ class WP_Widget_RSS extends WP_Widget {
 	 * Sets up a new RSS widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -35,7 +34,6 @@ class WP_Widget_RSS extends WP_Widget {
 	 * Outputs the content for the current RSS widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -97,7 +95,6 @@ class WP_Widget_RSS extends WP_Widget {
 	 * Handles updating settings for the current RSS widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -113,7 +110,6 @@ class WP_Widget_RSS extends WP_Widget {
 	 * Outputs the settings form for the RSS widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
diff --git a/wp-includes/widgets/class-wp-widget-search.php b/wp-includes/widgets/class-wp-widget-search.php
index f7d67bb5b4..4ab4098903 100644
--- a/wp-includes/widgets/class-wp-widget-search.php
+++ b/wp-includes/widgets/class-wp-widget-search.php
@@ -20,7 +20,6 @@ class WP_Widget_Search extends WP_Widget {
 	 * Sets up a new Search widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -35,7 +34,6 @@ class WP_Widget_Search extends WP_Widget {
 	 * Outputs the content for the current Search widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -60,7 +58,6 @@ class WP_Widget_Search extends WP_Widget {
 	 * Outputs the settings form for the Search widget.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
@@ -76,7 +73,6 @@ class WP_Widget_Search extends WP_Widget {
 	 * Handles updating settings for the current Search widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
diff --git a/wp-includes/widgets/class-wp-widget-tag-cloud.php b/wp-includes/widgets/class-wp-widget-tag-cloud.php
index bb25cd830a..9e332e5ac6 100644
--- a/wp-includes/widgets/class-wp-widget-tag-cloud.php
+++ b/wp-includes/widgets/class-wp-widget-tag-cloud.php
@@ -20,7 +20,6 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * Sets up a new Tag Cloud widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -34,7 +33,6 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * Outputs the content for the current Tag Cloud widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -95,7 +93,6 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * Handles updating settings for the current Tag Cloud widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -114,7 +111,6 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * Outputs the Tag Cloud widget settings form.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 */
@@ -184,7 +180,6 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * Retrieves the taxonomy for the current Tag cloud widget instance.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 *
 	 * @param array $instance Current settings.
 	 * @return string Name of the current taxonomy if set, otherwise 'post_tag'.
diff --git a/wp-includes/widgets/class-wp-widget-text.php b/wp-includes/widgets/class-wp-widget-text.php
index 2f43df3bea..c28ed1f317 100644
--- a/wp-includes/widgets/class-wp-widget-text.php
+++ b/wp-includes/widgets/class-wp-widget-text.php
@@ -28,7 +28,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * Sets up a new Text widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 */
 	public function __construct() {
 		$widget_ops = array(
@@ -181,7 +180,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * Outputs the content for the current Text widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
@@ -270,7 +268,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * Handles updating settings for the current Text widget instance.
 	 *
 	 * @since 2.8.0
-	 * @access public
 	 *
 	 * @param array $new_instance New settings for this instance as input by the user via
 	 *                            WP_Widget::form().
@@ -320,7 +317,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * Loads the required scripts and styles for the widget control.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function enqueue_admin_scripts() {
 		wp_enqueue_editor();
@@ -333,7 +329,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * @since 2.8.0
 	 * @since 4.8.0 Form only contains hidden inputs which are synced with JS template.
 	 * @since 4.8.1 Restored original form to be displayed when in legacy mode.
-	 * @access public
 	 * @see WP_Widget_Visual_Text::render_control_template_scripts()
 	 *
 	 * @param array $instance Current settings.
@@ -381,7 +376,6 @@ class WP_Widget_Text extends WP_Widget {
 	 * Render form template scripts.
 	 *
 	 * @since 4.8.0
-	 * @access public
 	 */
 	public function render_control_template_scripts() {
 		$dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 92891f1c45..f68d602350 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -56,7 +56,6 @@ class wpdb {
 	 * evaluated to true.
 	 *
 	 * @since 0.71
-	 * @access private
 	 * @var bool
 	 */
 	var $show_errors = false;
@@ -64,7 +63,6 @@ class wpdb {
 	/**
 	 * Whether to suppress errors during the DB bootstrapping.
 	 *
-	 * @access private
 	 * @since 2.5.0
 	 * @var bool
 	 */
@@ -82,7 +80,6 @@ class wpdb {
 	 * Amount of queries made
 	 *
 	 * @since 1.2.0
-	 * @access public
 	 * @var int
 	 */
 	public $num_queries = 0;
@@ -91,7 +88,6 @@ class wpdb {
 	 * Count of rows returned by previous query
 	 *
 	 * @since 0.71
-	 * @access public
 	 * @var int
 	 */
 	public $num_rows = 0;
@@ -100,7 +96,6 @@ class wpdb {
 	 * Count of affected rows by previous query
 	 *
 	 * @since 0.71
-	 * @access private
 	 * @var int
 	 */
 	var $rows_affected = 0;
@@ -109,7 +104,6 @@ class wpdb {
 	 * The ID generated for an AUTO_INCREMENT column by the previous query (usually INSERT).
 	 *
 	 * @since 0.71
-	 * @access public
 	 * @var int
 	 */
 	public $insert_id = 0;
@@ -118,7 +112,6 @@ class wpdb {
 	 * Last query made
 	 *
 	 * @since 0.71
-	 * @access private
 	 * @var array
 	 */
 	var $last_query;
@@ -127,7 +120,6 @@ class wpdb {
 	 * Results of the last query made
 	 *
 	 * @since 0.71
-	 * @access private
 	 * @var array|null
 	 */
 	var $last_result;
@@ -136,7 +128,6 @@ class wpdb {
 	 * MySQL result, which is either a resource or boolean.
 	 *
 	 * @since 0.71
-	 * @access protected
 	 * @var mixed
 	 */
 	protected $result;
@@ -145,7 +136,6 @@ class wpdb {
 	 * Cached column info, for sanity checking data before inserting
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $col_meta = array();
@@ -154,7 +144,6 @@ class wpdb {
 	 * Calculated character sets on tables
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $table_charset = array();
@@ -163,7 +152,6 @@ class wpdb {
 	 * Whether text fields in the current query need to be sanity checked.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 * @var bool
 	 */
 	protected $check_current_query = true;
@@ -172,7 +160,6 @@ class wpdb {
 	 * Flag to ensure we don't run into recursion problems when checking the collation.
 	 *
 	 * @since 4.2.0
-	 * @access private
 	 * @see wpdb::check_safe_collation()
 	 * @var bool
 	 */
@@ -182,7 +169,6 @@ class wpdb {
 	 * Saved info on the table column
 	 *
 	 * @since 0.71
-	 * @access protected
 	 * @var array
 	 */
 	protected $col_info;
@@ -191,7 +177,6 @@ class wpdb {
 	 * Saved queries that were executed
 	 *
 	 * @since 1.5.0
-	 * @access private
 	 * @var array
 	 */
 	var $queries;
@@ -200,7 +185,6 @@ class wpdb {
 	 * The number of times to retry reconnecting before dying.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 * @see wpdb::check_connection()
 	 * @var int
 	 */
@@ -214,7 +198,6 @@ class wpdb {
 	 * security precautions.
 	 *
 	 * @since 2.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $prefix = '';
@@ -223,7 +206,6 @@ class wpdb {
 	 * WordPress base table prefix.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	 public $base_prefix;
@@ -232,7 +214,6 @@ class wpdb {
 	 * Whether the database queries are ready to start executing.
 	 *
 	 * @since 2.3.2
-	 * @access private
 	 * @var bool
 	 */
 	var $ready = false;
@@ -241,7 +222,6 @@ class wpdb {
 	 * Blog ID.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var int
 	 */
 	public $blogid = 0;
@@ -250,7 +230,6 @@ class wpdb {
 	 * Site ID.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var int
 	 */
 	public $siteid = 0;
@@ -259,7 +238,6 @@ class wpdb {
 	 * List of WordPress per-blog tables
 	 *
 	 * @since 2.5.0
-	 * @access private
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -272,7 +250,6 @@ class wpdb {
 	 * categories, post2cat, and link2cat were deprecated in 2.3.0, db version 5539
 	 *
 	 * @since 2.9.0
-	 * @access private
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -282,7 +259,6 @@ class wpdb {
 	 * List of WordPress global tables
 	 *
 	 * @since 3.0.0
-	 * @access private
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -292,7 +268,6 @@ class wpdb {
 	 * List of Multisite global tables
 	 *
 	 * @since 3.0.0
-	 * @access private
 	 * @see wpdb::tables()
 	 * @var array
 	 */
@@ -303,7 +278,6 @@ class wpdb {
 	 * WordPress Comments table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $comments;
@@ -312,7 +286,6 @@ class wpdb {
 	 * WordPress Comment Metadata table
 	 *
 	 * @since 2.9.0
-	 * @access public
 	 * @var string
 	 */
 	public $commentmeta;
@@ -321,7 +294,6 @@ class wpdb {
 	 * WordPress Links table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $links;
@@ -330,7 +302,6 @@ class wpdb {
 	 * WordPress Options table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $options;
@@ -339,7 +310,6 @@ class wpdb {
 	 * WordPress Post Metadata table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $postmeta;
@@ -348,7 +318,6 @@ class wpdb {
 	 * WordPress Posts table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $posts;
@@ -357,7 +326,6 @@ class wpdb {
 	 * WordPress Terms table
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $terms;
@@ -366,7 +334,6 @@ class wpdb {
 	 * WordPress Term Relationships table
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $term_relationships;
@@ -375,7 +342,6 @@ class wpdb {
 	 * WordPress Term Taxonomy table
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $term_taxonomy;
@@ -384,7 +350,6 @@ class wpdb {
 	 * WordPress Term Meta table.
 	 *
 	 * @since 4.4.0
-	 * @access public
 	 * @var string
 	 */
 	public $termmeta;
@@ -397,7 +362,6 @@ class wpdb {
 	 * WordPress User Metadata table
 	 *
 	 * @since 2.3.0
-	 * @access public
 	 * @var string
 	 */
 	public $usermeta;
@@ -406,7 +370,6 @@ class wpdb {
 	 * WordPress Users table
 	 *
 	 * @since 1.5.0
-	 * @access public
 	 * @var string
 	 */
 	public $users;
@@ -415,7 +378,6 @@ class wpdb {
 	 * Multisite Blogs table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $blogs;
@@ -424,7 +386,6 @@ class wpdb {
 	 * Multisite Blog Versions table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $blog_versions;
@@ -433,7 +394,6 @@ class wpdb {
 	 * Multisite Registration Log table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $registration_log;
@@ -442,7 +402,6 @@ class wpdb {
 	 * Multisite Signups table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $signups;
@@ -451,7 +410,6 @@ class wpdb {
 	 * Multisite Sites table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $site;
@@ -460,7 +418,6 @@ class wpdb {
 	 * Multisite Sitewide Terms table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $sitecategories;
@@ -469,7 +426,6 @@ class wpdb {
 	 * Multisite Site Metadata table
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $sitemeta;
@@ -485,7 +441,6 @@ class wpdb {
 	 * @see wpdb::update()
 	 * @see wpdb::delete()
 	 * @see wp_set_wpdb_vars()
-	 * @access public
 	 * @var array
 	 */
 	public $field_types = array();
@@ -494,7 +449,6 @@ class wpdb {
 	 * Database table columns charset
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $charset;
@@ -503,7 +457,6 @@ class wpdb {
 	 * Database table columns collate
 	 *
 	 * @since 2.2.0
-	 * @access public
 	 * @var string
 	 */
 	public $collate;
@@ -512,7 +465,6 @@ class wpdb {
 	 * Database Username
 	 *
 	 * @since 2.9.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $dbuser;
@@ -521,7 +473,6 @@ class wpdb {
 	 * Database Password
 	 *
 	 * @since 3.1.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $dbpassword;
@@ -530,7 +481,6 @@ class wpdb {
 	 * Database Name
 	 *
 	 * @since 3.1.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $dbname;
@@ -539,7 +489,6 @@ class wpdb {
 	 * Database Host
 	 *
 	 * @since 3.1.0
-	 * @access protected
 	 * @var string
 	 */
 	protected $dbhost;
@@ -548,7 +497,6 @@ class wpdb {
 	 * Database Handle
 	 *
 	 * @since 0.71
-	 * @access protected
 	 * @var string
 	 */
 	protected $dbh;
@@ -557,7 +505,6 @@ class wpdb {
 	 * A textual description of the last query/get_row/get_var call
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 * @var string
 	 */
 	public $func_call;
@@ -571,7 +518,6 @@ class wpdb {
 	 * will force the checks to occur.
 	 *
 	 * @since 3.3.0
-	 * @access public
 	 * @var bool
 	 */
 	public $is_mysql = null;
@@ -580,7 +526,6 @@ class wpdb {
 	 * A list of incompatible SQL modes.
 	 *
 	 * @since 3.9.0
-	 * @access protected
 	 * @var array
 	 */
 	protected $incompatible_modes = array( 'NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
@@ -590,7 +535,6 @@ class wpdb {
 	 * Whether to use mysqli over mysql.
 	 *
 	 * @since 3.9.0
-	 * @access private
 	 * @var bool
 	 */
 	private $use_mysqli = false;
@@ -599,7 +543,6 @@ class wpdb {
 	 * Whether we've managed to successfully connect at some point
 	 *
 	 * @since 3.9.0
-	 * @access private
 	 * @var bool
 	 */
 	private $has_connected = false;
@@ -762,7 +705,6 @@ class wpdb {
 	 * For example, when able, utf8mb4 should be used instead of utf8.
 	 *
 	 * @since 4.6.0
-	 * @access public
 	 *
 	 * @param string $charset The character set to check.
 	 * @param string $collate The collation to check.
@@ -949,7 +891,6 @@ class wpdb {
 	 * Sets blog id.
 	 *
 	 * @since 3.0.0
-	 * @access public
 	 *
 	 * @param int $blog_id
 	 * @param int $site_id Optional.
@@ -1141,7 +1082,6 @@ class wpdb {
 	 * @deprecated 3.6.0 Use wpdb::prepare()
 	 * @see wpdb::prepare
 	 * @see esc_sql()
-	 * @access private
 	 *
 	 * @param string $string
 	 * @return string
@@ -1158,7 +1098,6 @@ class wpdb {
 	 * @see mysqli_real_escape_string()
 	 * @see mysql_real_escape_string()
 	 * @since 2.8.0
-	 * @access private
 	 *
 	 * @param  string $string to escape
 	 * @return string escaped
@@ -1187,7 +1126,6 @@ class wpdb {
 	 *
 	 * @uses wpdb::_real_escape()
 	 * @since  2.8.0
-	 * @access public
 	 *
 	 * @param  string|array $data
 	 * @return string|array escaped
@@ -1325,7 +1263,6 @@ class wpdb {
 	 *     $sql  = esc_sql( $wpdb->esc_like( $input ) );
 	 *
 	 * @since 4.0.0
-	 * @access public
 	 *
 	 * @param string $text The raw text to be escaped. The input typed by the user should have no
 	 *                     extra or deleted slashes.
@@ -1861,7 +1798,6 @@ class wpdb {
 	 *
 	 * @since 3.9.0
 	 *
-	 * @access private
 	 * @see wpdb::query()
 	 *
 	 * @param string $query The query to run.
@@ -1938,7 +1874,6 @@ class wpdb {
 	 *
 	 * Runs an insert or replace query based on $type argument.
 	 *
-	 * @access private
 	 * @since 3.0.0
 	 * @see wpdb::prepare()
 	 * @see wpdb::$field_types
@@ -2121,7 +2056,6 @@ class wpdb {
 	 * stripped, then field processing is rejected and the query fails.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $table  Table name.
 	 * @param array  $data   Field/value pair.
@@ -2158,7 +2092,6 @@ class wpdb {
 	 * Prepares arrays of value/format pairs as passed to wpdb CRUD methods.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param array $data   Array of fields to values.
 	 * @param mixed $format Formats to be mapped to the values in $data.
@@ -2194,7 +2127,6 @@ class wpdb {
 	 * the wpdb::process_field_formats() method.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param array  $data  As it comes from the wpdb::process_field_formats() method.
 	 * @param string $table Table name.
@@ -2225,7 +2157,6 @@ class wpdb {
 	 * For string fields, record the maximum string length that field can safely save.
 	 *
 	 * @since 4.2.1
-	 * @access protected
 	 *
 	 * @param array  $data  As it comes from the wpdb::process_field_charsets() method.
 	 * @param string $table Table name.
@@ -2427,7 +2358,6 @@ class wpdb {
 	 * Retrieves the character set for the given table.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $table Table name.
 	 * @return string|WP_Error Table character set, WP_Error object if it couldn't be found.
@@ -2528,7 +2458,6 @@ class wpdb {
 	 * Retrieves the character set for the given column.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param string $table  Table name.
 	 * @param string $column Column name.
@@ -2593,7 +2522,6 @@ class wpdb {
 	 * The length may either be specified as a byte length or a character length.
 	 *
 	 * @since 4.2.1
-	 * @access public
 	 *
 	 * @param string $table  Table name.
 	 * @param string $column Column name.
@@ -2686,7 +2614,6 @@ class wpdb {
 	 * the search to finish as soon as it encounters a non-ASCII character.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $string String to check.
 	 * @return bool True if ASCII, false if not.
@@ -2707,7 +2634,6 @@ class wpdb {
 	 * Check if the query is accessing a collation considered safe on the current version of MySQL.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $query The query to check.
 	 * @return bool True if the collation is safe, false if it isn't.
@@ -2765,7 +2691,6 @@ class wpdb {
 	 * Strips any invalid characters based on value/charset pairs.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param array $data Array of value arrays. Each value array has the keys
 	 *                    'value' and 'charset'. An optional 'ascii' key can be
@@ -2925,7 +2850,6 @@ class wpdb {
 	 * Strips any invalid characters from the query.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $query Query to convert.
 	 * @return string|WP_Error The converted query, or a WP_Error object if the conversion fails.
@@ -2971,7 +2895,6 @@ class wpdb {
 	 * Strips any invalid characters from the string for a given table and column.
 	 *
 	 * @since 4.2.0
-	 * @access public
 	 *
 	 * @param string $table  Table name.
 	 * @param string $column Column name.
@@ -3012,7 +2935,6 @@ class wpdb {
 	 * Find the first table name referenced in a query.
 	 *
 	 * @since 4.2.0
-	 * @access protected
 	 *
 	 * @param string $query The query to search.
 	 * @return string|false $table The table name found, or false if a table couldn't be found.
@@ -3079,7 +3001,6 @@ class wpdb {
 	 *
 	 * @since 3.5.0
 	 *
-	 * @access protected
 	 */
 	protected function load_col_info() {
 		if ( $this->col_info )
@@ -3176,7 +3097,6 @@ class wpdb {
 	 * Closes the current database connection.
 	 *
 	 * @since 4.5.0
-	 * @access public
 	 *
 	 * @return bool True if the connection was successfully closed, false if it wasn't,
 	 *              or the connection doesn't exist.