diff --git a/phpseclib/Common/Functions/Strings.php b/phpseclib/Common/Functions/Strings.php
index 23bb2428..952e2e09 100644
--- a/phpseclib/Common/Functions/Strings.php
+++ b/phpseclib/Common/Functions/Strings.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Common
- * @package   Functions\Strings
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,7 +19,6 @@ use phpseclib3\Math\Common\FiniteField;
 /**
  * Common String Functions
  *
- * @package Functions\Strings
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 abstract class Strings
@@ -33,7 +30,6 @@ abstract class Strings
      *
      * @param string $string
      * @param int $index
-     * @access public
      * @return string
      */
     public static function shift(&$string, $index = 1)
@@ -50,7 +46,6 @@ abstract class Strings
      *
      * @param string $string
      * @param int $index
-     * @access public
      * @return string
      */
     public static function pop(&$string, $index = 1)
@@ -160,7 +155,6 @@ abstract class Strings
      *
      * @param string $format
      * @param string|int|float|array|bool ...$elements
-     * @access public
      * @return string
      */
     public static function packSSH2($format, ...$elements)
@@ -233,7 +227,6 @@ abstract class Strings
      *
      * Converts C5 to CCCCC, for example.
      *
-     * @access private
      * @param string $format
      * @return string
      */
@@ -257,7 +250,6 @@ abstract class Strings
      * of this function, bin refers to base-256 encoded data whilst bits refers
      * to base-2 encoded data
      *
-     * @access public
      * @param string $x
      * @return string
      */
@@ -304,7 +296,6 @@ abstract class Strings
     /**
      * Convert bits to binary data
      *
-     * @access public
      * @param string $x
      * @return string
      */
@@ -343,7 +334,6 @@ abstract class Strings
     /**
      * Switch Endianness Bit Order
      *
-     * @access public
      * @param string $x
      * @return string
      */
@@ -374,7 +364,6 @@ abstract class Strings
      *
      * @param string $var
      * @return string
-     * @access public
      */
     public static function increment_str(&$var)
     {
diff --git a/phpseclib/Crypt/AES.php b/phpseclib/Crypt/AES.php
index ccbafef2..40387162 100644
--- a/phpseclib/Crypt/AES.php
+++ b/phpseclib/Crypt/AES.php
@@ -39,8 +39,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   AES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -52,9 +50,7 @@ namespace phpseclib3\Crypt;
 /**
  * Pure-PHP implementation of AES.
  *
- * @package AES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class AES extends Rijndael
 {
@@ -64,7 +60,6 @@ class AES extends Rijndael
      * Since \phpseclib3\Crypt\AES extends \phpseclib3\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
      *
      * @see \phpseclib3\Crypt\Rijndael::setBlockLength()
-     * @access public
      * @param int $length
      * @throws \BadMethodCallException anytime it's called
      */
@@ -79,7 +74,6 @@ class AES extends Rijndael
      * Valid key lengths are 128, 192, and 256.  Set the link to bool(false) to disable a fixed key length
      *
      * @see \phpseclib3\Crypt\Rijndael:setKeyLength()
-     * @access public
      * @param int $length
      * @throws \LengthException if the key length isn't supported
      */
@@ -103,7 +97,6 @@ class AES extends Rijndael
      *
      * @see \phpseclib3\Crypt\Rijndael:setKey()
      * @see setKeyLength()
-     * @access public
      * @param string $key
      * @throws \LengthException if the key length isn't supported
      */
diff --git a/phpseclib/Crypt/Blowfish.php b/phpseclib/Crypt/Blowfish.php
index 9b14abab..530ca231 100644
--- a/phpseclib/Crypt/Blowfish.php
+++ b/phpseclib/Crypt/Blowfish.php
@@ -26,8 +26,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Blowfish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -42,10 +40,8 @@ use phpseclib3\Crypt\Common\BlockCipher;
 /**
  * Pure-PHP implementation of Blowfish.
  *
- * @package Blowfish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- * @access  public
  */
 class Blowfish extends BlockCipher
 {
@@ -54,7 +50,6 @@ class Blowfish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
     protected $block_size = 8;
 
@@ -63,7 +58,6 @@ class Blowfish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'blowfish';
 
@@ -72,7 +66,6 @@ class Blowfish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 500;
 
@@ -81,7 +74,6 @@ class Blowfish extends BlockCipher
      *
      * S-Box 0
      *
-     * @access private
      * @var    array
      */
     private static $sbox0 = [
@@ -122,7 +114,6 @@ class Blowfish extends BlockCipher
     /**
      * S-Box 1
      *
-     * @access private
      * @var    array
      */
     private static $sbox1 = [
@@ -163,7 +154,6 @@ class Blowfish extends BlockCipher
     /**
      * S-Box 2
      *
-     * @access private
      * @var    array
      */
     private static $sbox2 = [
@@ -204,7 +194,6 @@ class Blowfish extends BlockCipher
     /**
      * S-Box 3
      *
-     * @access private
      * @var    array
      */
     private static $sbox3 = [
@@ -246,7 +235,6 @@ class Blowfish extends BlockCipher
      * P-Array consists of 18 32-bit subkeys
      *
      * @var array
-     * @access private
      */
     private static $parray = [
         0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
@@ -260,7 +248,6 @@ class Blowfish extends BlockCipher
      * Holds the expanded key [p] and the key-depended s-boxes [sb]
      *
      * @var array
-     * @access private
      */
     private $bctx;
 
@@ -268,7 +255,6 @@ class Blowfish extends BlockCipher
      * Holds the last used key
      *
      * @var array
-     * @access private
      */
     private $kl;
 
@@ -281,7 +267,6 @@ class Blowfish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 16;
 
@@ -289,7 +274,6 @@ class Blowfish extends BlockCipher
      * Default Constructor.
      *
      * @param string $mode
-     * @access public
      * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -306,7 +290,6 @@ class Blowfish extends BlockCipher
      *
      * Key lengths can be between 32 and 448 bits.
      *
-     * @access public
      * @param int $length
      */
     public function setKeyLength($length)
@@ -327,7 +310,6 @@ class Blowfish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -350,7 +332,6 @@ class Blowfish extends BlockCipher
      * Setup the key (expansion)
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -405,7 +386,6 @@ class Blowfish extends BlockCipher
     /**
      * Encrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -439,7 +419,6 @@ class Blowfish extends BlockCipher
     /**
      * Decrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -473,7 +452,6 @@ class Blowfish extends BlockCipher
      * Setup the performance-optimized function for de/encrypt()
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupInlineCrypt()
-     * @access private
      */
     protected function setupInlineCrypt()
     {
diff --git a/phpseclib/Crypt/ChaCha20.php b/phpseclib/Crypt/ChaCha20.php
index 357edf44..e080d8fc 100644
--- a/phpseclib/Crypt/ChaCha20.php
+++ b/phpseclib/Crypt/ChaCha20.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   ChaCha20
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2019 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Exception\InsufficientSetupException;
 /**
  * Pure-PHP implementation of ChaCha20.
  *
- * @package ChaCha20
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class ChaCha20 extends Salsa20
 {
@@ -41,7 +37,6 @@ class ChaCha20 extends Salsa20
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
diff --git a/phpseclib/Crypt/Common/AsymmetricKey.php b/phpseclib/Crypt/Common/AsymmetricKey.php
index 4512eb85..f0e7e79a 100644
--- a/phpseclib/Crypt/Common/AsymmetricKey.php
+++ b/phpseclib/Crypt/Common/AsymmetricKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   AsymmetricKey
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,7 +23,6 @@ use phpseclib3\Math\BigInteger;
 /**
  * Base Class for all asymmetric cipher classes
  *
- * @package AsymmetricKey
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 abstract class AsymmetricKey
@@ -34,7 +31,6 @@ abstract class AsymmetricKey
      * Precomputed Zero
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected static $zero;
 
@@ -42,7 +38,6 @@ abstract class AsymmetricKey
      * Precomputed One
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected static $one;
 
@@ -50,7 +45,6 @@ abstract class AsymmetricKey
      * Format of the loaded key
      *
      * @var string
-     * @access private
      */
     protected $format;
 
@@ -58,7 +52,6 @@ abstract class AsymmetricKey
      * Hash function
      *
      * @var \phpseclib3\Crypt\Hash
-     * @access private
      */
     protected $hash;
 
@@ -66,7 +59,6 @@ abstract class AsymmetricKey
      * HMAC function
      *
      * @var \phpseclib3\Crypt\Hash
-     * @access private
      */
     private $hmac;
 
@@ -75,7 +67,6 @@ abstract class AsymmetricKey
      *
      * @see self::initialize_static_variables()
      * @var array
-     * @access private
      */
     private static $plugins = [];
 
@@ -84,7 +75,6 @@ abstract class AsymmetricKey
      *
      * @see self::initialize_static_variables()
      * @var array
-     * @access private
      */
     private static $invisiblePlugins = [];
 
@@ -93,7 +83,6 @@ abstract class AsymmetricKey
      *
      * @see self::initialize_static_variables()
      * @var array
-     * @access private
      */
     private static $signatureFormats = [];
 
@@ -102,7 +91,6 @@ abstract class AsymmetricKey
      *
      * @see self::initialize_static_variables()
      * @var array
-     * @access private
      */
     private static $signatureFileFormats = [];
 
@@ -110,7 +98,6 @@ abstract class AsymmetricKey
      * Available Engines
      *
      * @var boolean[]
-     * @access private
      */
     protected static $engines = [];
 
@@ -118,7 +105,6 @@ abstract class AsymmetricKey
      * Key Comment
      *
      * @var null|string
-     * @access private
      */
     private $comment;
 
@@ -199,7 +185,6 @@ abstract class AsymmetricKey
      * Loads a private key
      *
      * @return PrivateKey
-     * @access public
      * @param string|array $key
      * @param string $password optional
      */
@@ -216,7 +201,6 @@ abstract class AsymmetricKey
      * Loads a public key
      *
      * @return PublicKey
-     * @access public
      * @param string|array $key
      */
     public static function loadPublicKey($key)
@@ -232,7 +216,6 @@ abstract class AsymmetricKey
      * Loads parameters
      *
      * @return AsymmetricKey
-     * @access public
      * @param string|array $key
      */
     public static function loadParameters($key)
@@ -280,7 +263,6 @@ abstract class AsymmetricKey
      * Loads a private key
      *
      * @return PrivateKey
-     * @access public
      * @param string $type
      * @param string $key
      * @param string $password optional
@@ -298,7 +280,6 @@ abstract class AsymmetricKey
      * Loads a public key
      *
      * @return PublicKey
-     * @access public
      * @param string $type
      * @param string $key
      */
@@ -315,7 +296,6 @@ abstract class AsymmetricKey
      * Loads parameters
      *
      * @return AsymmetricKey
-     * @access public
      * @param string $type
      * @param string|array $key
      */
@@ -331,7 +311,6 @@ abstract class AsymmetricKey
     /**
      * Validate Plugin
      *
-     * @access private
      * @param string $format
      * @param string $type
      * @param string $method optional
@@ -354,7 +333,6 @@ abstract class AsymmetricKey
     /**
      * Load Plugins
      *
-     * @access private
      * @param string $format
      */
     private static function loadPlugins($format)
@@ -385,7 +363,6 @@ abstract class AsymmetricKey
     /**
      * Returns a list of supported formats.
      *
-     * @access public
      * @return array
      */
     public static function getSupportedKeyFormats()
@@ -403,7 +380,6 @@ abstract class AsymmetricKey
      *
      * @see self::load()
      * @param string $fullname
-     * @access public
      * @return bool
      */
     public static function addFileFormat($fullname)
@@ -427,7 +403,6 @@ abstract class AsymmetricKey
      * with RSA::createKey() then this will throw an exception.
      *
      * @see self::load()
-     * @access public
      * @return mixed
      */
     public function getLoadedFormat()
@@ -445,7 +420,6 @@ abstract class AsymmetricKey
      *
      * Not all key formats support comments. If you want to set a comment use toString()
      *
-     * @access public
      * @return null|string
      */
     public function getComment()
@@ -456,7 +430,6 @@ abstract class AsymmetricKey
     /**
      * Tests engine validity
      *
-     * @access public
      */
     public static function useBestEngine()
     {
@@ -475,7 +448,6 @@ abstract class AsymmetricKey
     /**
      * Flag to use internal engine only (useful for unit testing)
      *
-     * @access public
      */
     public static function useInternalEngine()
     {
@@ -499,7 +471,6 @@ abstract class AsymmetricKey
     /**
      * Determines which hashing function should be used
      *
-     * @access public
      * @param string $hash
      */
     public function withHash($hash)
@@ -515,7 +486,6 @@ abstract class AsymmetricKey
     /**
      * Returns the hash algorithm currently being used
      *
-     * @access public
      */
     public function getHash()
     {
@@ -526,7 +496,6 @@ abstract class AsymmetricKey
      * Compute the pseudorandom k for signature generation,
      * using the process specified for deterministic DSA.
      *
-     * @access public
      * @param string $h1
      * @return string
      */
@@ -571,7 +540,6 @@ abstract class AsymmetricKey
     /**
      * Integer to Octet String
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $v
      * @return string
      */
@@ -591,7 +559,6 @@ abstract class AsymmetricKey
     /**
      * Bit String to Integer
      *
-     * @access private
      * @param string $in
      * @return \phpseclib3\Math\BigInteger
      */
@@ -609,7 +576,6 @@ abstract class AsymmetricKey
     /**
      * Bit String to Octet String
      *
-     * @access private
      * @param string $in
      * @return string
      */
diff --git a/phpseclib/Crypt/Common/BlockCipher.php b/phpseclib/Crypt/Common/BlockCipher.php
index a8ed74d8..b2642be1 100644
--- a/phpseclib/Crypt/Common/BlockCipher.php
+++ b/phpseclib/Crypt/Common/BlockCipher.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   BlockCipher
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -19,7 +17,6 @@ namespace phpseclib3\Crypt\Common;
 /**
  * Base Class for all block cipher classes
  *
- * @package BlockCipher
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 abstract class BlockCipher extends SymmetricKey
diff --git a/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
index 7ed84a12..87a0b6fe 100644
--- a/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
+++ b/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
@@ -7,8 +7,6 @@
  *
  * Place in $HOME/.ssh/authorized_keys
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,9 +23,7 @@ use phpseclib3\Exception\UnsupportedFormatException;
 /**
  * OpenSSH Formatted RSA Key Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSH
 {
@@ -35,7 +31,6 @@ abstract class OpenSSH
      * Default comment
      *
      * @var string
-     * @access private
      */
     protected static $comment = 'phpseclib-generated-key';
 
@@ -43,14 +38,12 @@ abstract class OpenSSH
      * Binary key flag
      *
      * @var bool
-     * @access private
      */
     protected static $binary = false;
 
     /**
      * Sets the default comment
      *
-     * @access public
      * @param string $comment
      */
     public static function setComment($comment)
@@ -63,7 +56,6 @@ abstract class OpenSSH
      *
      * $type can be either ssh-dss or ssh-rsa
      *
-     * @access public
      * @param string $key
      * @param string $password
      * @return array
@@ -169,7 +161,6 @@ abstract class OpenSSH
      * Printable keys are what are generated by default. These are the ones that go in
      * $HOME/.ssh/authorized_key.
      *
-     * @access public
      * @param bool $enabled
      */
     public static function setBinaryOutput($enabled)
@@ -180,7 +171,6 @@ abstract class OpenSSH
     /**
      * Checks to see if the type is valid
      *
-     * @access private
      * @param string $candidate
      */
     private static function checkType($candidate)
@@ -193,7 +183,6 @@ abstract class OpenSSH
     /**
      * Wrap a private key appropriately
      *
-     * @access public
      * @param string $publicKey
      * @param string $privateKey
      * @param string $password
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
index 6566f278..0219400b 100644
--- a/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ namespace phpseclib3\Crypt\Common\Formats\Keys;
 /**
  * PKCS1 Formatted Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS
 {
@@ -41,7 +37,6 @@ abstract class PKCS
     /**
      * Is the key a base-64 encoded PEM, DER or should it be auto-detected?
      *
-     * @access private
      * @var int
      */
     protected static $format = self::MODE_ANY;
@@ -49,7 +44,6 @@ abstract class PKCS
     /**
      * Require base64-encoded PEM's be supplied
      *
-     * @access public
      */
     public static function requirePEM()
     {
@@ -59,7 +53,6 @@ abstract class PKCS
     /**
      * Require raw DER's be supplied
      *
-     * @access public
      */
     public static function requireDER()
     {
@@ -71,7 +64,6 @@ abstract class PKCS
      *
      * This is the default setting
      *
-     * @access public
      */
     public static function requireAny()
     {
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
index e9948ce8..c7094f63 100644
--- a/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -28,9 +26,7 @@ use phpseclib3\File\ASN1;
 /**
  * PKCS1 Formatted Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS1 extends PKCS
 {
@@ -38,14 +34,12 @@ abstract class PKCS1 extends PKCS
      * Default encryption algorithm
      *
      * @var string
-     * @access private
      */
     private static $defaultEncryptionAlgorithm = 'AES-128-CBC';
 
     /**
      * Sets the default encryption algorithm
      *
-     * @access public
      * @param string $algo
      */
     public static function setEncryptionAlgorithm($algo)
@@ -56,7 +50,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Returns the mode constant corresponding to the mode string
      *
-     * @access public
      * @param string $mode
      * @return int
      * @throws \UnexpectedValueException if the block cipher mode is unsupported
@@ -77,7 +70,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Returns a cipher object corresponding to a string
      *
-     * @access public
      * @param string $algo
      * @return string
      * @throws \UnexpectedValueException if the encryption algorithm is unsupported
@@ -102,7 +94,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Generate a symmetric key for PKCS#1 keys
      *
-     * @access private
      * @param string $password
      * @param string $iv
      * @param int $length
@@ -121,7 +112,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -176,7 +166,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Wrap a private key appropriately
      *
-     * @access public
      * @param string $key
      * @param string $type
      * @param string $password
@@ -209,7 +198,6 @@ abstract class PKCS1 extends PKCS
     /**
      * Wrap a public key appropriately
      *
-     * @access public
      * @param string $key
      * @param string $type
      * @return string
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
index e1b62f11..e0b35820 100644
--- a/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
+++ b/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
@@ -17,8 +17,6 @@
  * is specific to private keys it's basically creating a DER-encoded wrapper
  * for keys. This just extends that same concept to public keys (much like ssh-keygen)
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -43,9 +41,7 @@ use phpseclib3\File\ASN1\Maps;
 /**
  * PKCS#8 Formatted Key Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS8 extends PKCS
 {
@@ -53,7 +49,6 @@ abstract class PKCS8 extends PKCS
      * Default encryption algorithm
      *
      * @var string
-     * @access private
      */
     private static $defaultEncryptionAlgorithm = 'id-PBES2';
 
@@ -63,7 +58,6 @@ abstract class PKCS8 extends PKCS
      * Only used when defaultEncryptionAlgorithm is id-PBES2
      *
      * @var string
-     * @access private
      */
     private static $defaultEncryptionScheme = 'aes128-CBC-PAD';
 
@@ -73,7 +67,6 @@ abstract class PKCS8 extends PKCS
      * Only used when defaultEncryptionAlgorithm is id-PBES2
      *
      * @var string
-     * @access private
      */
     private static $defaultPRF = 'id-hmacWithSHA256';
 
@@ -81,7 +74,6 @@ abstract class PKCS8 extends PKCS
      * Default Iteration Count
      *
      * @var int
-     * @access private
      */
     private static $defaultIterationCount = 2048;
 
@@ -89,14 +81,12 @@ abstract class PKCS8 extends PKCS
      * OIDs loaded
      *
      * @var bool
-     * @access private
      */
     private static $oidsLoaded = false;
 
     /**
      * Sets the default encryption algorithm
      *
-     * @access public
      * @param string $algo
      */
     public static function setEncryptionAlgorithm($algo)
@@ -107,7 +97,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Sets the default encryption algorithm for PBES2
      *
-     * @access public
      * @param string $algo
      */
     public static function setEncryptionScheme($algo)
@@ -118,7 +107,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Sets the iteration count
      *
-     * @access public
      * @param int $count
      */
     public static function setIterationCount($count)
@@ -129,7 +117,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Sets the PRF for PBES2
      *
-     * @access public
      * @param string $algo
      */
     public static function setPRF($algo)
@@ -141,7 +128,6 @@ abstract class PKCS8 extends PKCS
      * Returns a SymmetricKey object based on a PBES1 $algo
      *
      * @return \phpseclib3\Crypt\Common\SymmetricKey
-     * @access public
      * @param string $algo
      */
     private static function getPBES1EncryptionObject($algo)
@@ -191,7 +177,6 @@ abstract class PKCS8 extends PKCS
      * Returns a hash based on a PBES1 $algo
      *
      * @return string
-     * @access public
      * @param string $algo
      */
     private static function getPBES1Hash($algo)
@@ -207,7 +192,6 @@ abstract class PKCS8 extends PKCS
      * Returns a KDF baesd on a PBES1 $algo
      *
      * @return string
-     * @access public
      * @param string $algo
      */
     private static function getPBES1KDF($algo)
@@ -229,7 +213,6 @@ abstract class PKCS8 extends PKCS
      * Returns a SymmetricKey object baesd on a PBES2 $algo
      *
      * @return SymmetricKey
-     * @access public
      * @param string $algo
      */
     private static function getPBES2EncryptionObject($algo)
@@ -264,7 +247,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Initialize static variables
      *
-     * @access private
      */
     private static function initialize_static_variables()
     {
@@ -328,7 +310,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -505,7 +486,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Wrap a private key appropriately
      *
-     * @access public
      * @param string $key
      * @param string $attr
      * @param mixed $params
@@ -619,7 +599,6 @@ abstract class PKCS8 extends PKCS
     /**
      * Wrap a public key appropriately
      *
-     * @access public
      * @param string $key
      * @param mixed $params
      * @param string $oid
diff --git a/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
index 086c0cb2..027774cc 100644
--- a/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
+++ b/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -28,9 +26,7 @@ use phpseclib3\Exception\UnsupportedAlgorithmException;
 /**
  * PuTTY Formatted Key Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PuTTY
 {
@@ -38,7 +34,6 @@ abstract class PuTTY
      * Default comment
      *
      * @var string
-     * @access private
      */
     private static $comment = 'phpseclib-generated-key';
 
@@ -46,14 +41,12 @@ abstract class PuTTY
      * Default version
      *
      * @var int
-     * @access private
      */
     private static $version = 2;
 
     /**
      * Sets the default comment
      *
-     * @access public
      * @param string $comment
      */
     public static function setComment($comment)
@@ -64,7 +57,6 @@ abstract class PuTTY
     /**
      * Sets the default version
      *
-     * @access public
      * @param int $version
      */
     public static function setVersion($version)
@@ -78,7 +70,6 @@ abstract class PuTTY
     /**
      * Generate a symmetric key for PuTTY v2 keys
      *
-     * @access private
      * @param string $password
      * @param int $length
      * @return string
@@ -97,7 +88,6 @@ abstract class PuTTY
     /**
      * Generate a symmetric key for PuTTY v3 keys
      *
-     * @access private
      * @param string $password
      * @param string $flavour
      * @param int $memory
@@ -135,7 +125,6 @@ abstract class PuTTY
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password
      * @return array
@@ -287,7 +276,6 @@ abstract class PuTTY
     /**
      * Wrap a private key appropriately
      *
-     * @access private
      * @param string $public
      * @param string $private
      * @param string $type
@@ -372,7 +360,6 @@ abstract class PuTTY
      *
      * This is basically the format described in RFC 4716 (https://tools.ietf.org/html/rfc4716)
      *
-     * @access private
      * @param string $key
      * @param string $type
      * @return string
diff --git a/phpseclib/Crypt/Common/Formats/Signature/Raw.php b/phpseclib/Crypt/Common/Formats/Signature/Raw.php
index 13e56e3b..ab8e7e46 100644
--- a/phpseclib/Crypt/Common/Formats/Signature/Raw.php
+++ b/phpseclib/Crypt/Common/Formats/Signature/Raw.php
@@ -7,8 +7,6 @@
  *
  * Handles signatures as arrays
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,16 +20,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * Raw Signature Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Raw
 {
     /**
      * Loads a signature
      *
-     * @access public
      * @param array $sig
      * @return array|bool
      */
@@ -54,7 +49,6 @@ abstract class Raw
     /**
      * Returns a signature in the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $r
      * @param \phpseclib3\Math\BigInteger $s
      * @return string
diff --git a/phpseclib/Crypt/Common/PrivateKey.php b/phpseclib/Crypt/Common/PrivateKey.php
index 7f23a482..a6e1eb0b 100644
--- a/phpseclib/Crypt/Common/PrivateKey.php
+++ b/phpseclib/Crypt/Common/PrivateKey.php
@@ -3,8 +3,6 @@
 /**
  * PrivateKey interface
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -16,9 +14,7 @@ namespace phpseclib3\Crypt\Common;
 /**
  * PrivateKey interface
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 interface PrivateKey
 {
diff --git a/phpseclib/Crypt/Common/PublicKey.php b/phpseclib/Crypt/Common/PublicKey.php
index 0696de18..48a5875b 100644
--- a/phpseclib/Crypt/Common/PublicKey.php
+++ b/phpseclib/Crypt/Common/PublicKey.php
@@ -3,8 +3,6 @@
 /**
  * PublicKey interface
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -16,9 +14,7 @@ namespace phpseclib3\Crypt\Common;
 /**
  * PublicKey interface
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 interface PublicKey
 {
diff --git a/phpseclib/Crypt/Common/StreamCipher.php b/phpseclib/Crypt/Common/StreamCipher.php
index f4d076d0..0e2d6f0c 100644
--- a/phpseclib/Crypt/Common/StreamCipher.php
+++ b/phpseclib/Crypt/Common/StreamCipher.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   StreamCipher
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -19,7 +17,6 @@ namespace phpseclib3\Crypt\Common;
 /**
  * Base Class for all stream cipher classes
  *
- * @package StreamCipher
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 abstract class StreamCipher extends SymmetricKey
@@ -31,7 +28,6 @@ abstract class StreamCipher extends SymmetricKey
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
     protected $block_size = 0;
 
@@ -49,7 +45,6 @@ abstract class StreamCipher extends SymmetricKey
     /**
      * Stream ciphers not use an IV
      *
-     * @access public
      * @return bool
      */
     public function usesIV()
diff --git a/phpseclib/Crypt/Common/SymmetricKey.php b/phpseclib/Crypt/Common/SymmetricKey.php
index 400a7d5c..f7640d1f 100644
--- a/phpseclib/Crypt/Common/SymmetricKey.php
+++ b/phpseclib/Crypt/Common/SymmetricKey.php
@@ -25,8 +25,6 @@
  *
  *  - Please read all the other comments/notes/hints here also for each class var/method
  *
- * @category  Crypt
- * @package   Base
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -50,7 +48,6 @@ use phpseclib3\Math\PrimeField;
 /**
  * Base Class for all \phpseclib3\Crypt\* cipher classes
  *
- * @package Base
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
  */
@@ -62,7 +59,6 @@ abstract class SymmetricKey
      * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
      *
      * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -71,7 +67,6 @@ abstract class SymmetricKey
      * Encrypt / decrypt using the Electronic Code Book mode.
      *
      * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -80,7 +75,6 @@ abstract class SymmetricKey
      * Encrypt / decrypt using the Code Book Chaining mode.
      *
      * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -89,7 +83,6 @@ abstract class SymmetricKey
      * Encrypt / decrypt using the Cipher Feedback mode.
      *
      * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -97,7 +90,6 @@ abstract class SymmetricKey
     /**
      * Encrypt / decrypt using the Cipher Feedback mode (8bit)
      *
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -105,7 +97,6 @@ abstract class SymmetricKey
     /**
      * Encrypt / decrypt using the Output Feedback mode (8bit)
      *
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -114,7 +105,6 @@ abstract class SymmetricKey
      * Encrypt / decrypt using the Output Feedback mode.
      *
      * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -123,7 +113,6 @@ abstract class SymmetricKey
      * Encrypt / decrypt using Galois/Counter mode.
      *
      * @link https://en.wikipedia.org/wiki/Galois/Counter_Mode
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -131,7 +120,6 @@ abstract class SymmetricKey
     /**
      * Encrypt / decrypt using streaming mode.
      *
-     * @access public
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      */
@@ -140,7 +128,6 @@ abstract class SymmetricKey
     /**
      * Mode Map
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const MODE_MAP = [
@@ -158,42 +145,36 @@ abstract class SymmetricKey
     /**
      * Base value for the internal implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_INTERNAL = 1;
     /**
      * Base value for the eval() implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_EVAL = 2;
     /**
      * Base value for the mcrypt implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_MCRYPT = 3;
     /**
      * Base value for the openssl implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_OPENSSL = 4;
     /**
      * Base value for the libsodium implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_LIBSODIUM = 5;
     /**
      * Base value for the openssl / gcm implementation $engine switch
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      */
     const ENGINE_OPENSSL_GCM = 6;
@@ -201,7 +182,6 @@ abstract class SymmetricKey
     /**
      * Engine Reverse Map
      *
-     * @access private
      * @see \phpseclib3\Crypt\Common\SymmetricKey::getEngine()
      */
     const ENGINE_MAP = [
@@ -218,7 +198,6 @@ abstract class SymmetricKey
      *
      * @see self::__construct()
      * @var int
-     * @access private
      */
     protected $mode;
 
@@ -226,7 +205,6 @@ abstract class SymmetricKey
      * The Block Length of the block cipher
      *
      * @var int
-     * @access private
      */
     protected $block_size = 16;
 
@@ -235,7 +213,6 @@ abstract class SymmetricKey
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
     protected $key = false;
 
@@ -244,7 +221,6 @@ abstract class SymmetricKey
      *
      * @see self::setIV()
      * @var string
-     * @access private
      */
     protected $iv = false;
 
@@ -254,7 +230,6 @@ abstract class SymmetricKey
      * @see self::enableContinuousBuffer()
      * @see self::clearBuffers()
      * @var string
-     * @access private
      */
     protected $encryptIV;
 
@@ -264,7 +239,6 @@ abstract class SymmetricKey
      * @see self::enableContinuousBuffer()
      * @see self::clearBuffers()
      * @var string
-     * @access private
      */
     protected $decryptIV;
 
@@ -273,7 +247,6 @@ abstract class SymmetricKey
      *
      * @see self::enableContinuousBuffer()
      * @var bool
-     * @access private
      */
     protected $continuousBuffer = false;
 
@@ -283,7 +256,6 @@ abstract class SymmetricKey
      * @see self::encrypt()
      * @see self::clearBuffers()
      * @var array
-     * @access private
      */
     protected $enbuffer;
 
@@ -293,7 +265,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @see self::clearBuffers()
      * @var array
-     * @access private
      */
     protected $debuffer;
 
@@ -305,7 +276,6 @@ abstract class SymmetricKey
      *
      * @see self::encrypt()
      * @var resource
-     * @access private
      */
     private $enmcrypt;
 
@@ -317,7 +287,6 @@ abstract class SymmetricKey
      *
      * @see self::decrypt()
      * @var resource
-     * @access private
      */
     private $demcrypt;
 
@@ -327,7 +296,6 @@ abstract class SymmetricKey
      * @see \phpseclib3\Crypt\Twofish::setKey()
      * @see \phpseclib3\Crypt\Twofish::setIV()
      * @var bool
-     * @access private
      */
     private $enchanged = true;
 
@@ -337,7 +305,6 @@ abstract class SymmetricKey
      * @see \phpseclib3\Crypt\Twofish::setKey()
      * @see \phpseclib3\Crypt\Twofish::setIV()
      * @var bool
-     * @access private
      */
     private $dechanged = true;
 
@@ -356,7 +323,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @see self::setupMcrypt()
      * @var resource
-     * @access private
      */
     private $ecb;
 
@@ -378,7 +344,6 @@ abstract class SymmetricKey
      *
      * @see self::encrypt()
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 600;
 
@@ -389,7 +354,6 @@ abstract class SymmetricKey
      * @see self::setIV()
      * @see self::disableContinuousBuffer()
      * @var bool
-     * @access private
      */
     protected $changed = true;
 
@@ -398,7 +362,6 @@ abstract class SymmetricKey
      *
      * @see self::setup()
      * @var bool
-     * @access private
      */
     protected $nonIVChanged = true;
 
@@ -407,7 +370,6 @@ abstract class SymmetricKey
      *
      * @see self::enablePadding()
      * @var bool
-     * @access private
      */
     private $padding = true;
 
@@ -416,7 +378,6 @@ abstract class SymmetricKey
      *
      * @see self::__construct()
      * @var bool
-     * @access private
      */
     private $paddable = false;
 
@@ -436,7 +397,6 @@ abstract class SymmetricKey
      * @see self::encrypt()
      * @see self::decrypt()
      * @var int
-     * @access private
      */
     protected $engine;
 
@@ -446,7 +406,6 @@ abstract class SymmetricKey
      * @see self::setEngine()
      * @see self::setPreferredEngine()
      * @var int
-     * @access private
      */
     private $preferredEngine;
 
@@ -459,7 +418,6 @@ abstract class SymmetricKey
      * @link http://www.php.net/mcrypt_list_algorithms
      * @see self::setupMcrypt()
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt;
 
@@ -470,7 +428,6 @@ abstract class SymmetricKey
      *
      * @link http://www.php.net/openssl-get-cipher-methods
      * @var string
-     * @access private
      */
     protected $cipher_name_openssl;
 
@@ -482,7 +439,6 @@ abstract class SymmetricKey
      *
      * @link http://www.php.net/openssl-get-cipher-methods
      * @var string
-     * @access private
      */
     protected $cipher_name_openssl_ecb;
 
@@ -491,7 +447,6 @@ abstract class SymmetricKey
      *
      * @see self::setPassword()
      * @var string
-     * @access private
      */
     private $password_default_salt = 'phpseclib/salt';
 
@@ -505,7 +460,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @see self::setupInlineCrypt()
      * @var Callback
-     * @access private
      */
     protected $inline_crypt;
 
@@ -514,7 +468,6 @@ abstract class SymmetricKey
      *
      * @see self::openssl_ctr_process()
      * @var bool
-     * @access private
      */
     private $openssl_emulate_ctr = false;
 
@@ -523,7 +476,6 @@ abstract class SymmetricKey
      *
      * @see self::clearBuffers()
      * @var bool
-     * @access private
      */
     private $skip_key_adjustment = false;
 
@@ -532,7 +484,6 @@ abstract class SymmetricKey
      *
      * @see self::setKeyLength()
      * @var bool
-     * @access private
      */
     protected $explicit_key_length = false;
 
@@ -542,7 +493,6 @@ abstract class SymmetricKey
      * @see self::setupGCM()
      * @see self::ghash()
      * @var BinaryField\Integer
-     * @access private
      */
     private $h;
 
@@ -550,7 +500,6 @@ abstract class SymmetricKey
      * Additional authenticated data
      *
      * @var string
-     * @access private
      */
     protected $aad = '';
 
@@ -558,7 +507,6 @@ abstract class SymmetricKey
      * Authentication Tag produced after a round of encryption
      *
      * @var string
-     * @access private
      */
     protected $newtag = false;
 
@@ -566,7 +514,6 @@ abstract class SymmetricKey
      * Authentication Tag to be verified during decryption
      *
      * @var string
-     * @access private
      */
     protected $oldtag = false;
 
@@ -576,7 +523,6 @@ abstract class SymmetricKey
      * @see self::__construct()
      * @see self::ghash()
      * @var BinaryField
-     * @access private
      */
     private static $gcmField;
 
@@ -586,7 +532,6 @@ abstract class SymmetricKey
      * @see self::enablePoly1305()
      * @see self::poly1305()
      * @var PrimeField
-     * @access private
      */
     private static $poly1305Field;
 
@@ -596,7 +541,6 @@ abstract class SymmetricKey
      * @see self::setPoly1305Key()
      * @see self::poly1305()
      * @var string
-     * @access private
      */
     protected $poly1305Key;
 
@@ -606,7 +550,6 @@ abstract class SymmetricKey
      * @see self::setPoly1305Key()
      * @see self::enablePoly1305()
      * @var boolean
-     * @access private
      */
     protected $usePoly1305 = false;
 
@@ -618,7 +561,6 @@ abstract class SymmetricKey
      *
      * @see self::setIV()
      * @var string
-     * @access private
      */
     private $origIV = false;
 
@@ -630,7 +572,6 @@ abstract class SymmetricKey
      *
      * @see self::setNonce()
      * @var string
-     * @access private
      */
     protected $nonce = false;
 
@@ -656,7 +597,6 @@ abstract class SymmetricKey
      * - gcm
      *
      * @param string $mode
-     * @access public
      * @throws BadModeException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -707,7 +647,6 @@ abstract class SymmetricKey
      *
      * {@internal Can be overwritten by a sub class, but does not have to be}
      *
-     * @access public
      * @param string $iv
      * @throws \LengthException if the IV length isn't equal to the block size
      * @throws \BadMethodCallException if an IV is provided when one shouldn't be
@@ -739,7 +678,6 @@ abstract class SymmetricKey
      *
      * Once enabled Poly1305 cannot be disabled.
      *
-     * @access public
      * @throws \BadMethodCallException if Poly1305 is enabled whilst in GCM mode
      */
     public function enablePoly1305()
@@ -757,7 +695,6 @@ abstract class SymmetricKey
      * Once enabled Poly1305 cannot be disabled. If $key is not passed then an attempt to call createPoly1305Key
      * will be made.
      *
-     * @access public
      * @param string $key optional
      * @throws \LengthException if the key isn't long enough
      * @throws \BadMethodCallException if Poly1305 is enabled whilst in GCM mode
@@ -786,7 +723,6 @@ abstract class SymmetricKey
      *
      * setNonce() is only required when gcm is used
      *
-     * @access public
      * @param string $nonce
      * @throws \BadMethodCallException if an nonce is provided when one shouldn't be
      */
@@ -805,7 +741,6 @@ abstract class SymmetricKey
      *
      * setAAD() is only used by gcm or in poly1305 mode
      *
-     * @access public
      * @param string $aad
      * @throws \BadMethodCallException if mode isn't GCM or if poly1305 isn't being utilized
      */
@@ -821,7 +756,6 @@ abstract class SymmetricKey
     /**
      * Returns whether or not the algorithm uses an IV
      *
-     * @access public
      * @return bool
      */
     public function usesIV()
@@ -832,7 +766,6 @@ abstract class SymmetricKey
     /**
      * Returns whether or not the algorithm uses a nonce
      *
-     * @access public
      * @return bool
      */
     public function usesNonce()
@@ -843,7 +776,6 @@ abstract class SymmetricKey
     /**
      * Returns the current key length in bits
      *
-     * @access public
      * @return int
      */
     public function getKeyLength()
@@ -854,7 +786,6 @@ abstract class SymmetricKey
     /**
      * Returns the current block length in bits
      *
-     * @access public
      * @return int
      */
     public function getBlockLength()
@@ -865,7 +796,6 @@ abstract class SymmetricKey
     /**
      * Returns the current block length in bytes
      *
-     * @access public
      * @return int
      */
     public function getBlockLengthInBytes()
@@ -878,7 +808,6 @@ abstract class SymmetricKey
      *
      * Keys with explicitly set lengths need to be treated accordingly
      *
-     * @access public
      * @param int $length
      */
     public function setKeyLength($length)
@@ -903,7 +832,6 @@ abstract class SymmetricKey
      *
      * {@internal Could, but not must, extend by the child Crypt_* class}
      *
-     * @access public
      * @param string $key
      */
     public function setKey($key)
@@ -934,7 +862,6 @@ abstract class SymmetricKey
      * @param string[] ...$func_args
      * @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
      * @return bool
-     * @access public
      */
     public function setPassword($password, $method = 'pbkdf2', ...$func_args)
     {
@@ -1074,7 +1001,6 @@ abstract class SymmetricKey
      * {@link https://tools.ietf.org/html/rfc7292#appendix-B}
      *
      * @see self::setPassword()
-     * @access private
      * @param int $n
      * @param \phpseclib3\Crypt\Hash $hashObj
      * @param string $i
@@ -1137,7 +1063,6 @@ abstract class SymmetricKey
      * {@internal Could, but not must, extend by the child Crypt_* class}
      *
      * @see self::decrypt()
-     * @access public
      * @param string $plaintext
      * @return string $ciphertext
      */
@@ -1517,7 +1442,6 @@ abstract class SymmetricKey
      * {@internal Could, but not must, extend by the child Crypt_* class}
      *
      * @see self::encrypt()
-     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      * @throws \LengthException if we're inside a block cipher and the ciphertext length is not a multiple of the block size
@@ -1888,7 +1812,6 @@ abstract class SymmetricKey
      * @see self::encrypt()
      * @param int $length optional
      * @return string
-     * @access public
      * @throws \LengthException if $length isn't of a sufficient length
      * @throws \RuntimeException if GCM mode isn't being used
      */
@@ -1923,7 +1846,6 @@ abstract class SymmetricKey
      *
      * @see self::decrypt()
      * @param string $tag
-     * @access public
      * @throws \LengthException if $length isn't of a sufficient length
      * @throws \RuntimeException if GCM mode isn't being used
      */
@@ -1953,7 +1875,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @param string $iv
      * @return string
-     * @access private
      */
     protected function getIV($iv)
     {
@@ -1974,7 +1895,6 @@ abstract class SymmetricKey
      * @param string $encryptIV
      * @param array $buffer
      * @return string
-     * @access private
      */
     private function openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
     {
@@ -2062,7 +1982,6 @@ abstract class SymmetricKey
      * @param string $encryptIV
      * @param array $buffer
      * @return string
-     * @access private
      */
     private function openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
     {
@@ -2108,7 +2027,6 @@ abstract class SymmetricKey
      * May need to be overwritten by classes extending this one in some cases
      *
      * @return string
-     * @access private
      */
     protected function openssl_translate_mode()
     {
@@ -2142,7 +2060,6 @@ abstract class SymmetricKey
      * transmitted separately)
      *
      * @see self::disablePadding()
-     * @access public
      */
     public function enablePadding()
     {
@@ -2153,7 +2070,6 @@ abstract class SymmetricKey
      * Do not pad packets.
      *
      * @see self::enablePadding()
-     * @access public
      */
     public function disablePadding()
     {
@@ -2197,7 +2113,6 @@ abstract class SymmetricKey
      * {@internal Could, but not must, extend by the child Crypt_* class}
      *
      * @see self::disableContinuousBuffer()
-     * @access public
      */
     public function enableContinuousBuffer()
     {
@@ -2222,7 +2137,6 @@ abstract class SymmetricKey
      * {@internal Could, but not must, extend by the child Crypt_* class}
      *
      * @see self::enableContinuousBuffer()
-     * @access public
      */
     public function disableContinuousBuffer()
     {
@@ -2243,7 +2157,6 @@ abstract class SymmetricKey
      *
      * @see self::__construct()
      * @param int $engine
-     * @access private
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -2293,7 +2206,6 @@ abstract class SymmetricKey
      *
      * @see self::__construct()
      * @param string $engine
-     * @access public
      * @return bool
      */
     public function isValidEngine($engine)
@@ -2330,7 +2242,6 @@ abstract class SymmetricKey
      *
      * @see self::__construct()
      * @param string $engine
-     * @access public
      */
     public function setPreferredEngine($engine)
     {
@@ -2349,7 +2260,6 @@ abstract class SymmetricKey
      * Returns the engine currently being utilized
      *
      * @see self::setEngine()
-     * @access public
      */
     public function getEngine()
     {
@@ -2360,7 +2270,6 @@ abstract class SymmetricKey
      * Sets the engine as appropriate
      *
      * @see self::__construct()
-     * @access private
      */
     protected function setEngine()
     {
@@ -2415,7 +2324,6 @@ abstract class SymmetricKey
      *
      * Note: Must be extended by the child \phpseclib3\Crypt\* class
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -2426,7 +2334,6 @@ abstract class SymmetricKey
      *
      * Note: Must be extended by the child \phpseclib3\Crypt\* class
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -2440,7 +2347,6 @@ abstract class SymmetricKey
      * Note: Must extend by the child \phpseclib3\Crypt\* class
      *
      * @see self::setup()
-     * @access private
      */
     abstract protected function setupKey();
 
@@ -2468,7 +2374,6 @@ abstract class SymmetricKey
      * @see self::setKey()
      * @see self::setIV()
      * @see self::disableContinuousBuffer()
-     * @access private
      */
     protected function setup()
     {
@@ -2571,7 +2476,6 @@ abstract class SymmetricKey
      * @see self::unpad()
      * @param string $text
      * @throws \LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
-     * @access private
      * @return string
      */
     protected function pad($text)
@@ -2600,7 +2504,6 @@ abstract class SymmetricKey
      * @see self::pad()
      * @param string $text
      * @throws \LengthException if the ciphertext's length is not a multiple of the block size
-     * @access private
      * @return string
      */
     protected function unpad($text)
@@ -2674,7 +2577,6 @@ abstract class SymmetricKey
      * @see self::createInlineCryptFunction()
      * @see self::encrypt()
      * @see self::decrypt()
-     * @access private
      */
     //protected function setupInlineCrypt();
 
@@ -2786,7 +2688,6 @@ abstract class SymmetricKey
      * @see self::encrypt()
      * @see self::decrypt()
      * @param array $cipher_code
-     * @access private
      * @return string (the name of the created callback function)
      */
     protected function createInlineCryptFunction($cipher_code)
@@ -3234,7 +3135,6 @@ abstract class SymmetricKey
      *
      * On ARM CPUs converting floats to ints doesn't always work
      *
-     * @access private
      * @param string $x
      * @return int
      */
@@ -3253,7 +3153,6 @@ abstract class SymmetricKey
     /**
      * eval()'able string for in-line float to int
      *
-     * @access private
      * @return string
      */
     protected static function safe_intval_inline()
@@ -3275,7 +3174,6 @@ abstract class SymmetricKey
      * See steps 1-2 of https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=23
      * for more info
      *
-     * @access private
      */
     private function setupGCM()
     {
@@ -3308,7 +3206,6 @@ abstract class SymmetricKey
      *
      * @see self::decrypt()
      * @see self::encrypt()
-     * @access private
      * @param string $x
      * @return string
      */
@@ -3343,7 +3240,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @see self::encrypt()
      * @see self::setupGCM()
-     * @access private
      * @param string $str
      * @return string
      */
@@ -3358,7 +3254,6 @@ abstract class SymmetricKey
      * @see self::decrypt()
      * @see self::encrypt()
      * @see self::setupGCM()
-     * @access private
      * @param string $str
      * @return string
      */
@@ -3376,7 +3271,6 @@ abstract class SymmetricKey
      *
      * @see self::decrypt()
      * @see self::encrypt()
-     * @access private
      * @param string $text
      * @return string
      */
@@ -3409,7 +3303,6 @@ abstract class SymmetricKey
      *
      * You can do $obj instanceof AES or whatever to get the cipher but you can't do that to get the mode
      *
-     * @access public
      * @return string
      */
     public function getMode()
diff --git a/phpseclib/Crypt/Common/Traits/Fingerprint.php b/phpseclib/Crypt/Common/Traits/Fingerprint.php
index 12a43b4d..9ca8926d 100644
--- a/phpseclib/Crypt/Common/Traits/Fingerprint.php
+++ b/phpseclib/Crypt/Common/Traits/Fingerprint.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Crypt\Hash;
 /**
  * Fingerprint Trait for Private Keys
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 trait Fingerprint
 {
@@ -33,7 +29,6 @@ trait Fingerprint
      * no public key currently loaded, false is returned.
      * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
      *
-     * @access public
      * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
      * for invalid values.
      * @return mixed
diff --git a/phpseclib/Crypt/Common/Traits/PasswordProtected.php b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
index 1b5e3fa9..0ac274e8 100644
--- a/phpseclib/Crypt/Common/Traits/PasswordProtected.php
+++ b/phpseclib/Crypt/Common/Traits/PasswordProtected.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ namespace phpseclib3\Crypt\Common\Traits;
 /**
  * Password Protected Trait for Private Keys
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 trait PasswordProtected
 {
@@ -39,7 +35,6 @@ trait PasswordProtected
      *
      * @see self::createKey()
      * @see self::load()
-     * @access public
      * @param string|bool $password
      */
     public function withPassword($password = false)
diff --git a/phpseclib/Crypt/DES.php b/phpseclib/Crypt/DES.php
index cdcb394f..fc45a692 100644
--- a/phpseclib/Crypt/DES.php
+++ b/phpseclib/Crypt/DES.php
@@ -32,8 +32,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   DES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -48,16 +46,13 @@ use phpseclib3\Exception\BadModeException;
 /**
  * Pure-PHP implementation of DES.
  *
- * @package DES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class DES extends BlockCipher
 {
     /**
      * Contains $keys[self::ENCRYPT]
      *
-     * @access private
      * @see \phpseclib3\Crypt\DES::setupKey()
      * @see \phpseclib3\Crypt\DES::processBlock()
      */
@@ -65,7 +60,6 @@ class DES extends BlockCipher
     /**
      * Contains $keys[self::DECRYPT]
      *
-     * @access private
      * @see \phpseclib3\Crypt\DES::setupKey()
      * @see \phpseclib3\Crypt\DES::processBlock()
      */
@@ -76,7 +70,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
     protected $block_size = 8;
 
@@ -85,7 +78,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 8;
 
@@ -94,7 +86,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'des';
 
@@ -103,7 +94,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::openssl_mode_names
      * @var array
-     * @access private
      */
     protected $openssl_mode_names = [
         self::MODE_ECB => 'des-ecb',
@@ -118,7 +108,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 500;
 
@@ -130,7 +119,6 @@ class DES extends BlockCipher
      * @see self::setupKey()
      * @see self::processBlock()
      * @var int
-     * @access private
      */
     protected $des_rounds = 1;
 
@@ -139,7 +127,6 @@ class DES extends BlockCipher
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
     protected $key_length_max = 8;
 
@@ -148,7 +135,6 @@ class DES extends BlockCipher
      *
      * @see self::setupKey()
      * @var array
-     * @access private
      */
     private $keys;
 
@@ -162,7 +148,6 @@ class DES extends BlockCipher
      * @see self::processBlock()
      * @see self::setupKey()
      * @var array
-     * @access private
      */
     protected static $shuffle = [
         "\x00\x00\x00\x00\x00\x00\x00\x00", "\x00\x00\x00\x00\x00\x00\x00\xFF",
@@ -301,7 +286,6 @@ class DES extends BlockCipher
      * Indexing this table with each source byte performs the initial bit permutation.
      *
      * @var array
-     * @access private
      */
     protected static $ipmap = [
         0x00, 0x10, 0x01, 0x11, 0x20, 0x30, 0x21, 0x31,
@@ -343,7 +327,6 @@ class DES extends BlockCipher
      * Indexing this table with a byte value reverses the bit order.
      *
      * @var array
-     * @access private
      */
     protected static $invipmap = [
         0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
@@ -387,7 +370,6 @@ class DES extends BlockCipher
      * P table: concatenation can then be replaced by exclusive ORs.
      *
      * @var array
-     * @access private
      */
     protected static $sbox1 = [
         0x00808200, 0x00000000, 0x00008000, 0x00808202,
@@ -412,7 +394,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box2
      *
      * @var array
-     * @access private
      */
     protected static $sbox2 = [
         0x40084010, 0x40004000, 0x00004000, 0x00084010,
@@ -437,7 +418,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box3
      *
      * @var array
-     * @access private
      */
     protected static $sbox3 = [
         0x00000104, 0x04010100, 0x00000000, 0x04010004,
@@ -462,7 +442,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box4
      *
      * @var array
-     * @access private
      */
     protected static $sbox4 = [
         0x80401000, 0x80001040, 0x80001040, 0x00000040,
@@ -487,7 +466,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box5
      *
      * @var array
-     * @access private
      */
     protected static $sbox5 = [
         0x00000080, 0x01040080, 0x01040000, 0x21000080,
@@ -512,7 +490,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box6
      *
      * @var array
-     * @access private
      */
     protected static $sbox6 = [
         0x10000008, 0x10200000, 0x00002000, 0x10202008,
@@ -537,7 +514,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box7
      *
      * @var array
-     * @access private
      */
     protected static $sbox7 = [
         0x00100000, 0x02100001, 0x02000401, 0x00000000,
@@ -562,7 +538,6 @@ class DES extends BlockCipher
      * Pre-permuted S-box8
      *
      * @var array
-     * @access private
      */
     protected static $sbox8 = [
         0x08000820, 0x00000800, 0x00020000, 0x08020820,
@@ -587,7 +562,6 @@ class DES extends BlockCipher
      * Default Constructor.
      *
      * @param string $mode
-     * @access public
      * @throws BadModeException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -606,7 +580,6 @@ class DES extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -629,7 +602,6 @@ class DES extends BlockCipher
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
-     * @access public
      * @param string $key
      */
     public function setKey($key)
@@ -648,7 +620,6 @@ class DES extends BlockCipher
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encryptBlock()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see self::encrypt()
-     * @access private
      * @param string $in
      * @return string
      */
@@ -663,7 +634,6 @@ class DES extends BlockCipher
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decryptBlock()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      * @see self::decrypt()
-     * @access private
      * @param string $in
      * @return string
      */
@@ -681,7 +651,6 @@ class DES extends BlockCipher
      *
      * @see self::encryptBlock()
      * @see self::decryptBlock()
-     * @access private
      * @param string $block
      * @param int $mode
      * @return string
@@ -765,7 +734,6 @@ class DES extends BlockCipher
      * Creates the key schedule
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -1300,7 +1268,6 @@ class DES extends BlockCipher
      * Setup the performance-optimized function for de/encrypt()
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
-     * @access private
      */
     protected function setupInlineCrypt()
     {
diff --git a/phpseclib/Crypt/DH.php b/phpseclib/Crypt/DH.php
index 42874356..5186f032 100644
--- a/phpseclib/Crypt/DH.php
+++ b/phpseclib/Crypt/DH.php
@@ -16,8 +16,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -37,9 +35,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP (EC)DH implementation
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DH extends AsymmetricKey
 {
@@ -47,7 +43,6 @@ abstract class DH extends AsymmetricKey
      * Algorithm Name
      *
      * @var string
-     * @access private
      */
     const ALGORITHM = 'DH';
 
@@ -55,7 +50,6 @@ abstract class DH extends AsymmetricKey
      * DH prime
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $prime;
 
@@ -65,7 +59,6 @@ abstract class DH extends AsymmetricKey
      * Prime divisor of p-1
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $base;
 
@@ -77,7 +70,6 @@ abstract class DH extends AsymmetricKey
      *  - an integer representing the size of the prime in bits (the base is assumed to be 2)
      *  - a string (eg. diffie-hellman-group14-sha1)
      *
-     * @access public
      * @return Parameters
      */
     public static function createParameters(...$args)
@@ -239,7 +231,6 @@ abstract class DH extends AsymmetricKey
      *
      * @param Parameters $params
      * @param int $length optional
-     * @access public
      * @return DH\PrivateKey
      */
     public static function createKey(Parameters $params, $length = 0)
@@ -265,7 +256,6 @@ abstract class DH extends AsymmetricKey
      *
      * @param PrivateKey|EC $private
      * @param PublicKey|BigInteger|string $public
-     * @access public
      * @return mixed
      */
     public static function computeSecret($private, $public)
@@ -336,7 +326,6 @@ abstract class DH extends AsymmetricKey
      * OnLoad Handler
      *
      * @return bool
-     * @access protected
      * @param array $components
      */
     protected static function onLoad($components)
@@ -365,7 +354,6 @@ abstract class DH extends AsymmetricKey
     /**
      * Determines which hashing function should be used
      *
-     * @access public
      * @param string $hash
      */
     public function withHash($hash)
@@ -376,7 +364,6 @@ abstract class DH extends AsymmetricKey
     /**
      * Returns the hash algorithm currently being used
      *
-     * @access public
      */
     public function getHash()
     {
@@ -390,7 +377,6 @@ abstract class DH extends AsymmetricKey
      * value.
      *
      * @see self::getPublicKey()
-     * @access public
      * @return mixed
      */
     public function getParameters()
diff --git a/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php b/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
index 094332a4..ccf5b3c0 100644
--- a/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
+++ b/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
@@ -13,8 +13,6 @@
  * DSA, whose format isn't really formally described anywhere, so might as well
  * use it to describe this, too.
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -31,16 +29,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * "PKCS1" Formatted DH Key Handler
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS1 extends Progenitor
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -65,7 +60,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert EC parameters to the appropriate format
      *
-     * @access public
      * @return string
      */
     public static function saveParameters(BigInteger $prime, BigInteger $base, array $options = [])
diff --git a/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php b/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
index 7dfa8108..2e4c26a2 100644
--- a/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
+++ b/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
@@ -11,8 +11,6 @@
  * -----BEGIN PRIVATE KEY-----
  * -----BEGIN PUBLIC KEY-----
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -30,9 +28,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#8 Formatted DH Key Handler
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS8 extends Progenitor
 {
@@ -40,7 +36,6 @@ abstract class PKCS8 extends Progenitor
      * OID Name
      *
      * @var string
-     * @access private
      */
     const OID_NAME = 'dhKeyAgreement';
 
@@ -48,7 +43,6 @@ abstract class PKCS8 extends Progenitor
      * OID Value
      *
      * @var string
-     * @access private
      */
     const OID_VALUE = '1.2.840.113549.1.3.1';
 
@@ -56,14 +50,12 @@ abstract class PKCS8 extends Progenitor
      * Child OIDs loaded
      *
      * @var bool
-     * @access private
      */
     protected static $childOIDsLoaded = false;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -112,7 +104,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $prime
      * @param \phpseclib3\Math\BigInteger $base
      * @param \phpseclib3\Math\BigInteger $privateKey
@@ -136,7 +127,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $prime
      * @param \phpseclib3\Math\BigInteger $base
      * @param \phpseclib3\Math\BigInteger $publicKey
diff --git a/phpseclib/Crypt/DH/Parameters.php b/phpseclib/Crypt/DH/Parameters.php
index d36283d0..e4c15576 100644
--- a/phpseclib/Crypt/DH/Parameters.php
+++ b/phpseclib/Crypt/DH/Parameters.php
@@ -3,8 +3,6 @@
 /**
  * DH Parameters
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ use phpseclib3\Crypt\DH;
 /**
  * DH Parameters
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Parameters extends DH
 {
diff --git a/phpseclib/Crypt/DH/PrivateKey.php b/phpseclib/Crypt/DH/PrivateKey.php
index a382630f..fe03452c 100644
--- a/phpseclib/Crypt/DH/PrivateKey.php
+++ b/phpseclib/Crypt/DH/PrivateKey.php
@@ -3,8 +3,6 @@
 /**
  * DH Private Key
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -19,9 +17,7 @@ use phpseclib3\Crypt\DH;
 /**
  * DH Private Key
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PrivateKey extends DH
 {
@@ -31,7 +27,6 @@ class PrivateKey extends DH
      * Private Key
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $privateKey;
 
@@ -39,14 +34,12 @@ class PrivateKey extends DH
      * Public Key
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $publicKey;
 
     /**
      * Returns the public key
      *
-     * @access public
      * @return DH\PublicKey
      */
     public function getPublicKey()
diff --git a/phpseclib/Crypt/DH/PublicKey.php b/phpseclib/Crypt/DH/PublicKey.php
index f4c6eb62..3536360c 100644
--- a/phpseclib/Crypt/DH/PublicKey.php
+++ b/phpseclib/Crypt/DH/PublicKey.php
@@ -3,8 +3,6 @@
 /**
  * DH Public Key
  *
- * @category  Crypt
- * @package   DH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -19,9 +17,7 @@ use phpseclib3\Crypt\DH;
 /**
  * DH Public Key
  *
- * @package DH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PublicKey extends DH
 {
diff --git a/phpseclib/Crypt/DSA.php b/phpseclib/Crypt/DSA.php
index ac52bc47..964a34cd 100644
--- a/phpseclib/Crypt/DSA.php
+++ b/phpseclib/Crypt/DSA.php
@@ -21,8 +21,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -41,9 +39,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP FIPS 186-4 compliant implementation of DSA.
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DSA extends AsymmetricKey
 {
@@ -51,7 +47,6 @@ abstract class DSA extends AsymmetricKey
      * Algorithm Name
      *
      * @var string
-     * @access private
      */
     const ALGORITHM = 'DSA';
 
@@ -59,7 +54,6 @@ abstract class DSA extends AsymmetricKey
      * DSA Prime P
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $p;
 
@@ -69,7 +63,6 @@ abstract class DSA extends AsymmetricKey
      * Prime divisor of p-1
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $q;
 
@@ -77,7 +70,6 @@ abstract class DSA extends AsymmetricKey
      * DSA Group Generator G
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $g;
 
@@ -85,7 +77,6 @@ abstract class DSA extends AsymmetricKey
      * DSA public key value y
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $y;
 
@@ -93,7 +84,6 @@ abstract class DSA extends AsymmetricKey
      * Signature Format
      *
      * @var string
-     * @access private
      */
     protected $sigFormat;
 
@@ -101,14 +91,12 @@ abstract class DSA extends AsymmetricKey
      * Signature Format (Short)
      *
      * @var string
-     * @access private
      */
     protected $shortFormat;
 
     /**
      * Create DSA parameters
      *
-     * @access public
      * @param int $L
      * @param int $N
      * @return \phpseclib3\Crypt\DSA|bool
@@ -186,7 +174,6 @@ abstract class DSA extends AsymmetricKey
      * Returns the private key, from which the publickey can be extracted
      *
      * @param int[] ...$args
-     * @access public
      * @return DSA\PrivateKey
      */
     public static function createKey(...$args)
@@ -227,7 +214,6 @@ abstract class DSA extends AsymmetricKey
      * OnLoad Handler
      *
      * @return bool
-     * @access protected
      * @param array $components
      */
     protected static function onLoad($components)
@@ -274,7 +260,6 @@ abstract class DSA extends AsymmetricKey
      *
      * More specifically, this L (the length of DSA Prime P) and N (the length of DSA Group Order q)
      *
-     * @access public
      * @return array
      */
     public function getLength()
@@ -287,7 +272,6 @@ abstract class DSA extends AsymmetricKey
      *
      * @see self::useInternalEngine()
      * @see self::useBestEngine()
-     * @access public
      * @return string
      */
     public function getEngine()
@@ -306,7 +290,6 @@ abstract class DSA extends AsymmetricKey
      * value.
      *
      * @see self::getPublicKey()
-     * @access public
      * @return mixed
      */
     public function getParameters()
@@ -324,7 +307,6 @@ abstract class DSA extends AsymmetricKey
      *
      * Valid values are: ASN1, SSH2, Raw
      *
-     * @access public
      * @param string $format
      */
     public function withSignatureFormat($format)
@@ -338,7 +320,6 @@ abstract class DSA extends AsymmetricKey
     /**
      * Returns the signature format currently being used
      *
-     * @access public
      */
     public function getSignatureFormat()
     {
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
index 922cc24a..cc204fa9 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
@@ -7,8 +7,6 @@
  *
  * Place in $HOME/.ssh/authorized_keys
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -24,9 +22,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * OpenSSH Formatted DSA Key Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSH extends Progenitor
 {
@@ -40,7 +36,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -70,7 +65,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -105,7 +99,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
index ff464b2f..a7208a04 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
@@ -19,8 +19,6 @@
  * The DSA private key format seems to have been adapted from the RSA private key format so
  * we're just re-using that as the name.
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -38,16 +36,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#1 Formatted DSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS1 extends Progenitor
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -82,7 +77,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert DSA parameters to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -106,7 +100,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -135,7 +128,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
index ff270595..aa0efa68 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
@@ -15,8 +15,6 @@
  * is specific to private keys it's basically creating a DER-encoded wrapper
  * for keys. This just extends that same concept to public keys (much like ssh-keygen)
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -34,9 +32,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#8 Formatted DSA Key Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS8 extends Progenitor
 {
@@ -44,7 +40,6 @@ abstract class PKCS8 extends Progenitor
      * OID Name
      *
      * @var string
-     * @access private
      */
     const OID_NAME = 'id-dsa';
 
@@ -52,7 +47,6 @@ abstract class PKCS8 extends Progenitor
      * OID Value
      *
      * @var string
-     * @access private
      */
     const OID_VALUE = '1.2.840.10040.4.1';
 
@@ -60,14 +54,12 @@ abstract class PKCS8 extends Progenitor
      * Child OIDs loaded
      *
      * @var bool
-     * @access private
      */
     protected static $childOIDsLoaded = false;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -121,7 +113,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -147,7 +138,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
index af50e451..ff7f4c95 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
@@ -10,8 +10,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -27,9 +25,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PuTTY Formatted DSA Key Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PuTTY extends Progenitor
 {
@@ -37,7 +33,6 @@ abstract class PuTTY extends Progenitor
      * Public Handler
      *
      * @var string
-     * @access private
      */
     const PUBLIC_HANDLER = 'phpseclib3\Crypt\DSA\Formats\Keys\OpenSSH';
 
@@ -45,14 +40,12 @@ abstract class PuTTY extends Progenitor
      * Algorithm Identifier
      *
      * @var array
-     * @access private
      */
     protected static $types = ['ssh-dss'];
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -75,7 +68,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -100,7 +92,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/Raw.php b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
index 04eba721..201aa6f9 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
@@ -7,8 +7,6 @@
  *
  * Reads and creates arrays as DSA keys
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,16 +20,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * Raw DSA Key Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Raw
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param array $key
      * @param string $password optional
      * @return array
@@ -61,7 +56,6 @@ abstract class Raw
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
@@ -78,7 +72,6 @@ abstract class Raw
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Keys/XML.php b/phpseclib/Crypt/DSA/Formats/Keys/XML.php
index a50fdced..17ee70d1 100644
--- a/phpseclib/Crypt/DSA/Formats/Keys/XML.php
+++ b/phpseclib/Crypt/DSA/Formats/Keys/XML.php
@@ -11,8 +11,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -29,16 +27,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * XML Formatted DSA Key Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class XML
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -120,7 +115,6 @@ abstract class XML
      *
      * See https://www.w3.org/TR/xmldsig-core/#sec-DSAKeyValue
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $p
      * @param \phpseclib3\Math\BigInteger $q
      * @param \phpseclib3\Math\BigInteger $g
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
index 7ee2d8d1..df52beed 100644
--- a/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
+++ b/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
@@ -8,8 +8,6 @@
  * Handles signatures in the format described in
  * https://tools.ietf.org/html/rfc3279#section-2.2.2
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,16 +23,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * ASN1 Signature Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ASN1
 {
     /**
      * Loads a signature
      *
-     * @access public
      * @param string $sig
      * @return array|bool
      */
@@ -56,7 +51,6 @@ abstract class ASN1
     /**
      * Returns a signature in the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $r
      * @param \phpseclib3\Math\BigInteger $s
      * @return string
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/Raw.php b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
index e362e41b..2657a2a8 100644
--- a/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
+++ b/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
 /**
  * Raw DSA Signature Handler
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Raw extends Progenitor
 {
diff --git a/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
index f378b772..dbfceabb 100644
--- a/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
+++ b/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
@@ -7,8 +7,6 @@
  *
  * Handles signatures in the format used by SSH2
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,16 +21,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * SSH2 Signature Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SSH2
 {
     /**
      * Loads a signature
      *
-     * @access public
      * @param string $sig
      * @return mixed
      */
@@ -60,7 +55,6 @@ abstract class SSH2
     /**
      * Returns a signature in the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $r
      * @param \phpseclib3\Math\BigInteger $s
      * @return string
diff --git a/phpseclib/Crypt/DSA/Parameters.php b/phpseclib/Crypt/DSA/Parameters.php
index 3f36e962..6bcb152d 100644
--- a/phpseclib/Crypt/DSA/Parameters.php
+++ b/phpseclib/Crypt/DSA/Parameters.php
@@ -3,8 +3,6 @@
 /**
  * DSA Parameters
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ use phpseclib3\Crypt\DSA;
 /**
  * DSA Parameters
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Parameters extends DSA
 {
diff --git a/phpseclib/Crypt/DSA/PrivateKey.php b/phpseclib/Crypt/DSA/PrivateKey.php
index 5d639079..7039941b 100644
--- a/phpseclib/Crypt/DSA/PrivateKey.php
+++ b/phpseclib/Crypt/DSA/PrivateKey.php
@@ -3,8 +3,6 @@
 /**
  * DSA Private Key
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * DSA Private Key
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PrivateKey extends DSA implements Common\PrivateKey
 {
@@ -33,7 +29,6 @@ class PrivateKey extends DSA implements Common\PrivateKey
      * DSA secret exponent x
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $x;
 
@@ -56,7 +51,6 @@ class PrivateKey extends DSA implements Common\PrivateKey
      * without the parameters and the PKCS1 DSA public key format does not include the parameters.
      *
      * @see self::getPrivateKey()
-     * @access public
      * @return mixed
      */
     public function getPublicKey()
@@ -78,7 +72,6 @@ class PrivateKey extends DSA implements Common\PrivateKey
      * Create a signature
      *
      * @see self::verify()
-     * @access public
      * @param string $message
      * @return mixed
      */
diff --git a/phpseclib/Crypt/DSA/PublicKey.php b/phpseclib/Crypt/DSA/PublicKey.php
index cd4cdc5c..7e00e24a 100644
--- a/phpseclib/Crypt/DSA/PublicKey.php
+++ b/phpseclib/Crypt/DSA/PublicKey.php
@@ -3,8 +3,6 @@
 /**
  * DSA Public Key
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Crypt\DSA\Formats\Signature\ASN1 as ASN1Signature;
 /**
  * DSA Public Key
  *
- * @package DSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PublicKey extends DSA implements Common\PublicKey
 {
@@ -32,7 +28,6 @@ class PublicKey extends DSA implements Common\PublicKey
      * Verify a signature
      *
      * @see self::verify()
-     * @access public
      * @param string $message
      * @param string $signature
      * @return mixed
diff --git a/phpseclib/Crypt/EC.php b/phpseclib/Crypt/EC.php
index 736c6148..703a7bc0 100644
--- a/phpseclib/Crypt/EC.php
+++ b/phpseclib/Crypt/EC.php
@@ -21,8 +21,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -51,9 +49,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP implementation of EC.
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EC extends AsymmetricKey
 {
@@ -61,7 +57,6 @@ abstract class EC extends AsymmetricKey
      * Algorithm Name
      *
      * @var string
-     * @access private
      */
     const ALGORITHM = 'EC';
 
@@ -83,7 +78,6 @@ abstract class EC extends AsymmetricKey
      * Signature Format
      *
      * @var string
-     * @access private
      */
     protected $format;
 
@@ -91,7 +85,6 @@ abstract class EC extends AsymmetricKey
      * Signature Format (Short)
      *
      * @var string
-     * @access private
      */
     protected $shortFormat;
 
@@ -133,7 +126,6 @@ abstract class EC extends AsymmetricKey
     /**
      * Create public / private key pair.
      *
-     * @access public
      * @param string $curve
      * @return \phpseclib3\Crypt\EC\PrivateKey
      */
@@ -207,7 +199,6 @@ abstract class EC extends AsymmetricKey
      * OnLoad Handler
      *
      * @return bool
-     * @access protected
      * @param array $components
      */
     protected static function onLoad($components)
@@ -257,7 +248,6 @@ abstract class EC extends AsymmetricKey
      *
      * Returns a string if it's a named curve, an array if not
      *
-     * @access public
      * @return string|array
      */
     public function getCurve()
@@ -305,7 +295,6 @@ abstract class EC extends AsymmetricKey
      *  elliptic curve domain parameters defines a group of order n generated
      *  by a base point P"
      *
-     * @access public
      * @return int
      */
     public function getLength()
@@ -318,7 +307,6 @@ abstract class EC extends AsymmetricKey
      *
      * @see self::useInternalEngine()
      * @see self::useBestEngine()
-     * @access public
      * @return string
      */
     public function getEngine()
@@ -357,7 +345,6 @@ abstract class EC extends AsymmetricKey
      * Returns the parameters
      *
      * @see self::getPublicKey()
-     * @access public
      * @param string $type optional
      * @return mixed
      */
@@ -377,7 +364,6 @@ abstract class EC extends AsymmetricKey
      *
      * Valid values are: ASN1, SSH2, Raw
      *
-     * @access public
      * @param string $format
      */
     public function withSignatureFormat($format)
@@ -395,7 +381,6 @@ abstract class EC extends AsymmetricKey
     /**
      * Returns the signature format currently being used
      *
-     * @access public
      */
     public function getSignatureFormat()
     {
@@ -409,7 +394,6 @@ abstract class EC extends AsymmetricKey
      *
      * @see self::sign()
      * @see self::verify()
-     * @access public
      * @param string $context optional
      */
     public function withContext($context = null)
@@ -436,7 +420,6 @@ abstract class EC extends AsymmetricKey
     /**
      * Returns the signature format currently being used
      *
-     * @access public
      */
     public function getContext()
     {
@@ -446,7 +429,6 @@ abstract class EC extends AsymmetricKey
     /**
      * Determines which hashing function should be used
      *
-     * @access public
      * @param string $hash
      */
     public function withHash($hash)
diff --git a/phpseclib/Crypt/EC/BaseCurves/Base.php b/phpseclib/Crypt/EC/BaseCurves/Base.php
index 9f116bf1..60729d74 100644
--- a/phpseclib/Crypt/EC/BaseCurves/Base.php
+++ b/phpseclib/Crypt/EC/BaseCurves/Base.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Base
  *
- * @package Prime
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Base
 {
diff --git a/phpseclib/Crypt/EC/BaseCurves/Binary.php b/phpseclib/Crypt/EC/BaseCurves/Binary.php
index 0c9d9826..4fc6c70c 100644
--- a/phpseclib/Crypt/EC/BaseCurves/Binary.php
+++ b/phpseclib/Crypt/EC/BaseCurves/Binary.php
@@ -13,8 +13,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -30,9 +28,7 @@ use phpseclib3\Math\BinaryField\Integer as BinaryInteger;
 /**
  * Curves over y^2 + x*y = x^3 + a*x^2 + b
  *
- * @package Binary
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Binary extends Base
 {
diff --git a/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php b/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
index 7e641ec5..0495913c 100644
--- a/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
+++ b/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
@@ -20,8 +20,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -36,9 +34,7 @@ use phpseclib3\Math\PrimeField;
 /**
  * Curves over y^2 = x^3 + b
  *
- * @package KoblitzPrime
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class KoblitzPrime extends Prime
 {
diff --git a/phpseclib/Crypt/EC/BaseCurves/Montgomery.php b/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
index 10066953..e3fa50b3 100644
--- a/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
+++ b/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
@@ -16,8 +16,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2019 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -34,9 +32,7 @@ use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
 /**
  * Curves over y^2 = x^3 + a*x + x
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Montgomery extends Base
 {
diff --git a/phpseclib/Crypt/EC/BaseCurves/Prime.php b/phpseclib/Crypt/EC/BaseCurves/Prime.php
index ccf56439..6b9ea791 100644
--- a/phpseclib/Crypt/EC/BaseCurves/Prime.php
+++ b/phpseclib/Crypt/EC/BaseCurves/Prime.php
@@ -13,8 +13,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -32,9 +30,7 @@ use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
 /**
  * Curves over y^2 = x^3 + a*x + b
  *
- * @package Prime
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Prime extends Base
 {
diff --git a/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php b/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
index 6fb04c77..2521a4c0 100644
--- a/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
+++ b/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
@@ -18,8 +18,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -35,9 +33,7 @@ use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
 /**
  * Curves over a*x^2 + y^2 = 1 + d*x^2*y^2
  *
- * @package Prime
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class TwistedEdwards extends Base
 {
diff --git a/phpseclib/Crypt/EC/Curves/Curve25519.php b/phpseclib/Crypt/EC/Curves/Curve25519.php
index 3d158263..0f3f4d82 100644
--- a/phpseclib/Crypt/EC/Curves/Curve25519.php
+++ b/phpseclib/Crypt/EC/Curves/Curve25519.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2019 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/Curve448.php b/phpseclib/Crypt/EC/Curves/Curve448.php
index d0ce3265..f4a44231 100644
--- a/phpseclib/Crypt/EC/Curves/Curve448.php
+++ b/phpseclib/Crypt/EC/Curves/Curve448.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2019 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/Ed25519.php b/phpseclib/Crypt/EC/Curves/Ed25519.php
index 4f64cff1..0b776a51 100644
--- a/phpseclib/Crypt/EC/Curves/Ed25519.php
+++ b/phpseclib/Crypt/EC/Curves/Ed25519.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/Ed448.php b/phpseclib/Crypt/EC/Curves/Ed448.php
index 3a7313a8..c4b14428 100644
--- a/phpseclib/Crypt/EC/Curves/Ed448.php
+++ b/phpseclib/Crypt/EC/Curves/Ed448.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
index 4792926d..7bc2272a 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
index f0b5bc20..ebfb29ae 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
@@ -18,8 +18,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
index 03ccc3a2..6ec848bc 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
index ce39535b..e6a86bbd 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
index 1d17f1c5..3d7d8726 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
index ec3558c1..3d4f9289 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
index d97dafb1..5780da76 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
index 9c1d1cdb..724d8b8f 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
index 21672531..182e6227 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
index 1c76b856..d5a620d8 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
index a911b6c6..a20b4b44 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
index 12bc5882..366660e6 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php b/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
index 9931f3b2..5efe5e1a 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php b/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
index d4027d10..745863a6 100644
--- a/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
+++ b/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistb233.php b/phpseclib/Crypt/EC/Curves/nistb233.php
index f9998cff..bae12b06 100644
--- a/phpseclib/Crypt/EC/Curves/nistb233.php
+++ b/phpseclib/Crypt/EC/Curves/nistb233.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistb409.php b/phpseclib/Crypt/EC/Curves/nistb409.php
index 20cb29d9..a46153d3 100644
--- a/phpseclib/Crypt/EC/Curves/nistb409.php
+++ b/phpseclib/Crypt/EC/Curves/nistb409.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistk163.php b/phpseclib/Crypt/EC/Curves/nistk163.php
index 9bb8e482..8b263761 100644
--- a/phpseclib/Crypt/EC/Curves/nistk163.php
+++ b/phpseclib/Crypt/EC/Curves/nistk163.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistk233.php b/phpseclib/Crypt/EC/Curves/nistk233.php
index c9c7e187..69e14138 100644
--- a/phpseclib/Crypt/EC/Curves/nistk233.php
+++ b/phpseclib/Crypt/EC/Curves/nistk233.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistk283.php b/phpseclib/Crypt/EC/Curves/nistk283.php
index 673d8387..9e95f10e 100644
--- a/phpseclib/Crypt/EC/Curves/nistk283.php
+++ b/phpseclib/Crypt/EC/Curves/nistk283.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistk409.php b/phpseclib/Crypt/EC/Curves/nistk409.php
index 5e6f6a84..06bd9af7 100644
--- a/phpseclib/Crypt/EC/Curves/nistk409.php
+++ b/phpseclib/Crypt/EC/Curves/nistk409.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistp192.php b/phpseclib/Crypt/EC/Curves/nistp192.php
index a9a8edb5..ddead3cf 100644
--- a/phpseclib/Crypt/EC/Curves/nistp192.php
+++ b/phpseclib/Crypt/EC/Curves/nistp192.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistp224.php b/phpseclib/Crypt/EC/Curves/nistp224.php
index fcccb795..746571b4 100644
--- a/phpseclib/Crypt/EC/Curves/nistp224.php
+++ b/phpseclib/Crypt/EC/Curves/nistp224.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistp256.php b/phpseclib/Crypt/EC/Curves/nistp256.php
index 4853cdf9..a26c0f99 100644
--- a/phpseclib/Crypt/EC/Curves/nistp256.php
+++ b/phpseclib/Crypt/EC/Curves/nistp256.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistp384.php b/phpseclib/Crypt/EC/Curves/nistp384.php
index 04e6c716..1f20c02d 100644
--- a/phpseclib/Crypt/EC/Curves/nistp384.php
+++ b/phpseclib/Crypt/EC/Curves/nistp384.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistp521.php b/phpseclib/Crypt/EC/Curves/nistp521.php
index 21a96d78..86fa0508 100644
--- a/phpseclib/Crypt/EC/Curves/nistp521.php
+++ b/phpseclib/Crypt/EC/Curves/nistp521.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/nistt571.php b/phpseclib/Crypt/EC/Curves/nistt571.php
index bd1696af..7908b38b 100644
--- a/phpseclib/Crypt/EC/Curves/nistt571.php
+++ b/phpseclib/Crypt/EC/Curves/nistt571.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime192v1.php b/phpseclib/Crypt/EC/Curves/prime192v1.php
index d4f01e84..e9c13cd8 100644
--- a/phpseclib/Crypt/EC/Curves/prime192v1.php
+++ b/phpseclib/Crypt/EC/Curves/prime192v1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime192v2.php b/phpseclib/Crypt/EC/Curves/prime192v2.php
index 05e95fdf..e3e341f2 100644
--- a/phpseclib/Crypt/EC/Curves/prime192v2.php
+++ b/phpseclib/Crypt/EC/Curves/prime192v2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime192v3.php b/phpseclib/Crypt/EC/Curves/prime192v3.php
index 216f81a6..1e97992d 100644
--- a/phpseclib/Crypt/EC/Curves/prime192v3.php
+++ b/phpseclib/Crypt/EC/Curves/prime192v3.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime239v1.php b/phpseclib/Crypt/EC/Curves/prime239v1.php
index eb938312..084be9d7 100644
--- a/phpseclib/Crypt/EC/Curves/prime239v1.php
+++ b/phpseclib/Crypt/EC/Curves/prime239v1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime239v2.php b/phpseclib/Crypt/EC/Curves/prime239v2.php
index f89970e9..21941b83 100644
--- a/phpseclib/Crypt/EC/Curves/prime239v2.php
+++ b/phpseclib/Crypt/EC/Curves/prime239v2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime239v3.php b/phpseclib/Crypt/EC/Curves/prime239v3.php
index 7ee6f271..78c50f06 100644
--- a/phpseclib/Crypt/EC/Curves/prime239v3.php
+++ b/phpseclib/Crypt/EC/Curves/prime239v3.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/prime256v1.php b/phpseclib/Crypt/EC/Curves/prime256v1.php
index 5c90586a..c72b22e8 100644
--- a/phpseclib/Crypt/EC/Curves/prime256v1.php
+++ b/phpseclib/Crypt/EC/Curves/prime256v1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp112r1.php b/phpseclib/Crypt/EC/Curves/secp112r1.php
index e54f25c3..d1d3194b 100644
--- a/phpseclib/Crypt/EC/Curves/secp112r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp112r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp112r2.php b/phpseclib/Crypt/EC/Curves/secp112r2.php
index 83454430..da44e7fd 100644
--- a/phpseclib/Crypt/EC/Curves/secp112r2.php
+++ b/phpseclib/Crypt/EC/Curves/secp112r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp128r1.php b/phpseclib/Crypt/EC/Curves/secp128r1.php
index ee0b8afe..34456bc0 100644
--- a/phpseclib/Crypt/EC/Curves/secp128r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp128r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp128r2.php b/phpseclib/Crypt/EC/Curves/secp128r2.php
index 3b137dd7..e102c340 100644
--- a/phpseclib/Crypt/EC/Curves/secp128r2.php
+++ b/phpseclib/Crypt/EC/Curves/secp128r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp160k1.php b/phpseclib/Crypt/EC/Curves/secp160k1.php
index fbc73a9f..c6a33344 100644
--- a/phpseclib/Crypt/EC/Curves/secp160k1.php
+++ b/phpseclib/Crypt/EC/Curves/secp160k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp160r1.php b/phpseclib/Crypt/EC/Curves/secp160r1.php
index 9bbfbfe2..af468774 100644
--- a/phpseclib/Crypt/EC/Curves/secp160r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp160r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp160r2.php b/phpseclib/Crypt/EC/Curves/secp160r2.php
index e326c736..9bd23d23 100644
--- a/phpseclib/Crypt/EC/Curves/secp160r2.php
+++ b/phpseclib/Crypt/EC/Curves/secp160r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp192k1.php b/phpseclib/Crypt/EC/Curves/secp192k1.php
index 31a13176..79ff2e09 100644
--- a/phpseclib/Crypt/EC/Curves/secp192k1.php
+++ b/phpseclib/Crypt/EC/Curves/secp192k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp192r1.php b/phpseclib/Crypt/EC/Curves/secp192r1.php
index fb5ecf7c..83ab1c70 100644
--- a/phpseclib/Crypt/EC/Curves/secp192r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp192r1.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp224k1.php b/phpseclib/Crypt/EC/Curves/secp224k1.php
index ca85b981..79a5c541 100644
--- a/phpseclib/Crypt/EC/Curves/secp224k1.php
+++ b/phpseclib/Crypt/EC/Curves/secp224k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp224r1.php b/phpseclib/Crypt/EC/Curves/secp224r1.php
index 23ac2297..a9e474a3 100644
--- a/phpseclib/Crypt/EC/Curves/secp224r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp224r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp256k1.php b/phpseclib/Crypt/EC/Curves/secp256k1.php
index 69461210..462e7a1c 100644
--- a/phpseclib/Crypt/EC/Curves/secp256k1.php
+++ b/phpseclib/Crypt/EC/Curves/secp256k1.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp256r1.php b/phpseclib/Crypt/EC/Curves/secp256r1.php
index f929f4fa..9003373c 100644
--- a/phpseclib/Crypt/EC/Curves/secp256r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp256r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp384r1.php b/phpseclib/Crypt/EC/Curves/secp384r1.php
index 6d180fe9..98764a34 100644
--- a/phpseclib/Crypt/EC/Curves/secp384r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp384r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/secp521r1.php b/phpseclib/Crypt/EC/Curves/secp521r1.php
index 6e9164cb..b89a4ea7 100644
--- a/phpseclib/Crypt/EC/Curves/secp521r1.php
+++ b/phpseclib/Crypt/EC/Curves/secp521r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect113r1.php b/phpseclib/Crypt/EC/Curves/sect113r1.php
index dfbf094b..77ec7603 100644
--- a/phpseclib/Crypt/EC/Curves/sect113r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect113r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect113r2.php b/phpseclib/Crypt/EC/Curves/sect113r2.php
index e5a62a37..2185d60e 100644
--- a/phpseclib/Crypt/EC/Curves/sect113r2.php
+++ b/phpseclib/Crypt/EC/Curves/sect113r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect131r1.php b/phpseclib/Crypt/EC/Curves/sect131r1.php
index 9bd4f9a8..1365cb60 100644
--- a/phpseclib/Crypt/EC/Curves/sect131r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect131r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect131r2.php b/phpseclib/Crypt/EC/Curves/sect131r2.php
index 8351797e..93c11b2a 100644
--- a/phpseclib/Crypt/EC/Curves/sect131r2.php
+++ b/phpseclib/Crypt/EC/Curves/sect131r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect163k1.php b/phpseclib/Crypt/EC/Curves/sect163k1.php
index a25e7d6b..3c8574bb 100644
--- a/phpseclib/Crypt/EC/Curves/sect163k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect163k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect163r1.php b/phpseclib/Crypt/EC/Curves/sect163r1.php
index 5061bf1e..26afd87e 100644
--- a/phpseclib/Crypt/EC/Curves/sect163r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect163r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect163r2.php b/phpseclib/Crypt/EC/Curves/sect163r2.php
index c473b940..38f94661 100644
--- a/phpseclib/Crypt/EC/Curves/sect163r2.php
+++ b/phpseclib/Crypt/EC/Curves/sect163r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect193r1.php b/phpseclib/Crypt/EC/Curves/sect193r1.php
index 830f1ba2..951f261e 100644
--- a/phpseclib/Crypt/EC/Curves/sect193r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect193r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect193r2.php b/phpseclib/Crypt/EC/Curves/sect193r2.php
index 6bf2462b..e3ff47ac 100644
--- a/phpseclib/Crypt/EC/Curves/sect193r2.php
+++ b/phpseclib/Crypt/EC/Curves/sect193r2.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect233k1.php b/phpseclib/Crypt/EC/Curves/sect233k1.php
index 7a42f299..eea3f7ad 100644
--- a/phpseclib/Crypt/EC/Curves/sect233k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect233k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect233r1.php b/phpseclib/Crypt/EC/Curves/sect233r1.php
index 86d910c1..68219f0e 100644
--- a/phpseclib/Crypt/EC/Curves/sect233r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect233r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect239k1.php b/phpseclib/Crypt/EC/Curves/sect239k1.php
index 1c8fcd1f..0e6994ba 100644
--- a/phpseclib/Crypt/EC/Curves/sect239k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect239k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect283k1.php b/phpseclib/Crypt/EC/Curves/sect283k1.php
index fdd48226..279c24aa 100644
--- a/phpseclib/Crypt/EC/Curves/sect283k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect283k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect283r1.php b/phpseclib/Crypt/EC/Curves/sect283r1.php
index 32a52e66..e44a6076 100644
--- a/phpseclib/Crypt/EC/Curves/sect283r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect283r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect409k1.php b/phpseclib/Crypt/EC/Curves/sect409k1.php
index 3fbefd08..1fe329d8 100644
--- a/phpseclib/Crypt/EC/Curves/sect409k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect409k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect409r1.php b/phpseclib/Crypt/EC/Curves/sect409r1.php
index 683a0d77..3e209ef8 100644
--- a/phpseclib/Crypt/EC/Curves/sect409r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect409r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect571k1.php b/phpseclib/Crypt/EC/Curves/sect571k1.php
index c17e8722..3c54eabd 100644
--- a/phpseclib/Crypt/EC/Curves/sect571k1.php
+++ b/phpseclib/Crypt/EC/Curves/sect571k1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Curves/sect571r1.php b/phpseclib/Crypt/EC/Curves/sect571r1.php
index cd025ac2..172c1af9 100644
--- a/phpseclib/Crypt/EC/Curves/sect571r1.php
+++ b/phpseclib/Crypt/EC/Curves/sect571r1.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wiggint  on <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
diff --git a/phpseclib/Crypt/EC/Formats/Keys/Common.php b/phpseclib/Crypt/EC/Formats/Keys/Common.php
index c1fe4e86..88f3af4c 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/Common.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/Common.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -29,9 +27,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Generic EC Key Parsing Helper functions
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 trait Common
 {
diff --git a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
index 4658fbd6..3f1d40fc 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
@@ -12,8 +12,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -31,23 +29,19 @@ use phpseclib3\Math\BigInteger;
 /**
  * Montgomery Curve Private Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class MontgomeryPrivate
 {
     /**
      * Is invisible flag
      *
-     * @access private
      */
     const IS_INVISIBLE = true;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -77,7 +71,6 @@ abstract class MontgomeryPrivate
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
@@ -90,7 +83,6 @@ abstract class MontgomeryPrivate
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
diff --git a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
index 03f465e6..d1ad48a5 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,23 +21,19 @@ use phpseclib3\Math\BigInteger;
 /**
  * Montgomery Public Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class MontgomeryPublic
 {
     /**
      * Is invisible flag
      *
-     * @access private
      */
     const IS_INVISIBLE = true;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -66,7 +60,6 @@ abstract class MontgomeryPublic
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
diff --git a/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
index de20446c..a3aa482f 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
@@ -7,8 +7,6 @@
  *
  * Place in $HOME/.ssh/authorized_keys
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -27,9 +25,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * OpenSSH Formatted EC Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSH extends Progenitor
 {
@@ -50,7 +46,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -139,7 +134,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
@@ -177,7 +171,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php b/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
index dc494536..51a6d4ea 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
@@ -17,8 +17,6 @@
  * use it to describe this, too. PKCS1 is easier to remember than RFC5915, after
  * all. I suppose this could also be named IETF but idk
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -41,9 +39,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * "PKCS1" (RFC5915) Formatted EC Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS1 extends Progenitor
 {
@@ -52,7 +48,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -148,7 +143,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert EC parameters to the appropriate format
      *
-     * @access public
      * @return string
      */
     public static function saveParameters(BaseCurve $curve, array $options = [])
@@ -169,7 +163,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php b/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
index 346c8117..54a3e96f 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
@@ -15,8 +15,6 @@
  * is specific to private keys it's basically creating a DER-encoded wrapper
  * for keys. This just extends that same concept to public keys (much like ssh-keygen)
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -40,9 +38,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#8 Formatted EC Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS8 extends Progenitor
 {
@@ -52,7 +48,6 @@ abstract class PKCS8 extends Progenitor
      * OID Name
      *
      * @var array
-     * @access private
      */
     const OID_NAME = ['id-ecPublicKey', 'id-Ed25519', 'id-Ed448'];
 
@@ -60,14 +55,12 @@ abstract class PKCS8 extends Progenitor
      * OID Value
      *
      * @var string
-     * @access private
      */
     const OID_VALUE = ['1.2.840.10045.2.1', '1.3.101.112', '1.3.101.113'];
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -172,7 +165,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @param array $options optional
@@ -204,7 +196,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
diff --git a/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php b/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
index 87082570..0a579217 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,9 +23,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PuTTY Formatted EC Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PuTTY extends Progenitor
 {
@@ -37,7 +33,6 @@ abstract class PuTTY extends Progenitor
      * Public Handler
      *
      * @var string
-     * @access private
      */
     const PUBLIC_HANDLER = 'phpseclib3\Crypt\EC\Formats\Keys\OpenSSH';
 
@@ -45,7 +40,6 @@ abstract class PuTTY extends Progenitor
      * Supported Key Types
      *
      * @var array
-     * @access private
      */
     protected static $types = [
         'ecdsa-sha2-nistp256',
@@ -57,7 +51,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -90,7 +83,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
@@ -127,7 +119,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
      * @param \phpseclib3\Math\Common\FiniteField[] $publicKey
      * @return string
diff --git a/phpseclib/Crypt/EC/Formats/Keys/XML.php b/phpseclib/Crypt/EC/Formats/Keys/XML.php
index 598922b5..d548bc27 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/XML.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/XML.php
@@ -10,8 +10,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -33,9 +31,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * XML Formatted EC Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class XML
 {
@@ -58,7 +54,6 @@ abstract class XML
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
diff --git a/phpseclib/Crypt/EC/Formats/Keys/libsodium.php b/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
index ef815b60..c9259a07 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
@@ -9,8 +9,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -26,9 +24,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * libsodium Key Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class libsodium
 {
@@ -37,14 +33,12 @@ abstract class libsodium
     /**
      * Is invisible flag
      *
-     * @access private
      */
     const IS_INVISIBLE = true;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -85,7 +79,6 @@ abstract class libsodium
     /**
      * Convert an EC public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
      * @return string
@@ -98,7 +91,6 @@ abstract class libsodium
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $privateKey
      * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
      * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
diff --git a/phpseclib/Crypt/EC/Formats/Signature/ASN1.php b/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
index 82f0545d..d2a80a14 100644
--- a/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
+++ b/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
@@ -8,8 +8,6 @@
  * Handles signatures in the format described in
  * https://tools.ietf.org/html/rfc3279#section-2.2.3
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,16 +23,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * ASN1 Signature Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ASN1
 {
     /**
      * Loads a signature
      *
-     * @access public
      * @param string $sig
      * @return array
      */
@@ -56,7 +51,6 @@ abstract class ASN1
     /**
      * Returns a signature in the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $r
      * @param \phpseclib3\Math\BigInteger $s
      * @return string
diff --git a/phpseclib/Crypt/EC/Formats/Signature/Raw.php b/phpseclib/Crypt/EC/Formats/Signature/Raw.php
index eebef46b..7e4b47fe 100644
--- a/phpseclib/Crypt/EC/Formats/Signature/Raw.php
+++ b/phpseclib/Crypt/EC/Formats/Signature/Raw.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   DSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
 /**
  * Raw DSA Signature Handler
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Raw extends Progenitor
 {
diff --git a/phpseclib/Crypt/EC/Formats/Signature/SSH2.php b/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
index e63c022d..e0644421 100644
--- a/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
+++ b/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
@@ -7,8 +7,6 @@
  *
  * Handles signatures in the format used by SSH2
  *
- * @category  Crypt
- * @package   Common
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,16 +21,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * SSH2 Signature Handler
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SSH2
 {
     /**
      * Loads a signature
      *
-     * @access public
      * @param string $sig
      * @return mixed
      */
@@ -71,7 +66,6 @@ abstract class SSH2
     /**
      * Returns a signature in the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $r
      * @param \phpseclib3\Math\BigInteger $s
      * @param string $curve
diff --git a/phpseclib/Crypt/EC/Parameters.php b/phpseclib/Crypt/EC/Parameters.php
index 96527c75..c9bf1bea 100644
--- a/phpseclib/Crypt/EC/Parameters.php
+++ b/phpseclib/Crypt/EC/Parameters.php
@@ -3,8 +3,6 @@
 /**
  * EC Parameters
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ use phpseclib3\Crypt\EC;
 /**
  * EC Parameters
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Parameters extends EC
 {
diff --git a/phpseclib/Crypt/EC/PrivateKey.php b/phpseclib/Crypt/EC/PrivateKey.php
index fa160878..3632b778 100644
--- a/phpseclib/Crypt/EC/PrivateKey.php
+++ b/phpseclib/Crypt/EC/PrivateKey.php
@@ -3,8 +3,6 @@
 /**
  * EC Private Key
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -29,9 +27,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * EC Private Key
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PrivateKey extends EC implements Common\PrivateKey
 {
@@ -85,7 +81,6 @@ class PrivateKey extends EC implements Common\PrivateKey
      * Create a signature
      *
      * @see self::verify()
-     * @access public
      * @param string $message
      * @return mixed
      */
@@ -229,7 +224,6 @@ class PrivateKey extends EC implements Common\PrivateKey
      * Returns the public key
      *
      * @see self::getPrivateKey()
-     * @access public
      * @return mixed
      */
     public function getPublicKey()
diff --git a/phpseclib/Crypt/EC/PublicKey.php b/phpseclib/Crypt/EC/PublicKey.php
index de01cf8b..609d5960 100644
--- a/phpseclib/Crypt/EC/PublicKey.php
+++ b/phpseclib/Crypt/EC/PublicKey.php
@@ -3,8 +3,6 @@
 /**
  * EC Public Key
  *
- * @category  Crypt
- * @package   EC
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -28,9 +26,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * EC Public Key
  *
- * @package EC
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PublicKey extends EC implements Common\PublicKey
 {
@@ -40,7 +36,6 @@ class PublicKey extends EC implements Common\PublicKey
      * Verify a signature
      *
      * @see self::verify()
-     * @access public
      * @param string $message
      * @param string $signature
      * @return mixed
diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php
index 7bf2d2a8..5964c57d 100644
--- a/phpseclib/Crypt/Hash.php
+++ b/phpseclib/Crypt/Hash.php
@@ -21,8 +21,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Hash
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @author    Andreas Fischer <bantu@phpbb.com>
@@ -40,31 +38,26 @@ use phpseclib3\Math\BigInteger;
 use phpseclib3\Math\PrimeField;
 
 /**
- * @package Hash
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Andreas Fischer <bantu@phpbb.com>
- * @access  public
  */
 class Hash
 {
     /**
      * Padding Types
      *
-     * @access private
      */
     const PADDING_KECCAK = 1;
 
     /**
      * Padding Types
      *
-     * @access private
      */
     const PADDING_SHA3 = 2;
 
     /**
      * Padding Types
      *
-     * @access private
      */
     const PADDING_SHAKE = 3;
 
@@ -74,7 +67,6 @@ class Hash
      * Only used by SHA3
      *
      * @var int
-     * @access private
      */
     private $paddingType = 0;
 
@@ -83,7 +75,6 @@ class Hash
      *
      * @see self::setHash()
      * @var int
-     * @access private
      */
     private $hashParam;
 
@@ -92,7 +83,6 @@ class Hash
      *
      * @see self::setHash()
      * @var int
-     * @access private
      */
     private $length;
 
@@ -101,7 +91,6 @@ class Hash
      *
      * @see self::setHash()
      * @var string
-     * @access private
      */
     private $algo;
 
@@ -110,7 +99,6 @@ class Hash
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
     private $key = false;
 
@@ -119,7 +107,6 @@ class Hash
      *
      * @see self::setNonce()
      * @var string
-     * @access private
      */
     private $nonce = false;
 
@@ -127,7 +114,6 @@ class Hash
      * Hash Parameters
      *
      * @var array
-     * @access private
      */
     private $parameters = [];
 
@@ -136,7 +122,6 @@ class Hash
      *
      * @see self::_computeKey()
      * @var string
-     * @access private
      */
     private $computedKey = false;
 
@@ -147,7 +132,6 @@ class Hash
      *
      * @see self::hash()
      * @var string
-     * @access private
      */
     private $opad;
 
@@ -158,7 +142,6 @@ class Hash
      *
      * @see self::hash()
      * @var string
-     * @access private
      */
     private $ipad;
 
@@ -169,7 +152,6 @@ class Hash
      *
      * @see self::hash()
      * @var boolean
-     * @access private
      */
     private $recomputeAESKey;
 
@@ -178,7 +160,6 @@ class Hash
      *
      * @see self::hash()
      * @var \phpseclib3\Crypt\AES
-     * @access private
      */
     private $c;
 
@@ -187,7 +168,6 @@ class Hash
      *
      * @see self::hash()
      * @var string
-     * @access private
      */
     private $pad;
 
@@ -211,7 +191,6 @@ class Hash
      * Default Constructor.
      *
      * @param string $hash
-     * @access public
      */
     public function __construct($hash = 'sha256')
     {
@@ -223,7 +202,6 @@ class Hash
      *
      * Keys can be of any length.
      *
-     * @access public
      * @param string $key
      */
     public function setKey($key = false)
@@ -238,7 +216,6 @@ class Hash
      *
      * Keys can be of any length.
      *
-     * @access public
      * @param string $nonce
      */
     public function setNonce($nonce = false)
@@ -264,7 +241,6 @@ class Hash
      * when doing an HMAC multiple times it's faster to compute the hash once instead of computing it during
      * every call
      *
-     * @access private
      */
     private function computeKey()
     {
@@ -288,7 +264,6 @@ class Hash
      *
      * As set by the constructor or by the setHash() method.
      *
-     * @access public
      * @return string
      */
     public function getHash()
@@ -299,7 +274,6 @@ class Hash
     /**
      * Sets the hash function.
      *
-     * @access public
      * @param string $hash
      */
     public function setHash($hash)
@@ -793,7 +767,6 @@ class Hash
     /**
      * Compute the Hash / HMAC / UMAC.
      *
-     * @access public
      * @param string $text
      * @return string
      */
@@ -882,7 +855,6 @@ class Hash
     /**
      * Returns the hash length (in bits)
      *
-     * @access public
      * @return int
      */
     public function getLength()
@@ -893,7 +865,6 @@ class Hash
     /**
      * Returns the hash length (in bytes)
      *
-     * @access public
      * @return int
      */
     public function getLengthInBytes()
@@ -904,7 +875,6 @@ class Hash
     /**
      * Returns the block length (in bits)
      *
-     * @access public
      * @return int
      */
     public function getBlockLength()
@@ -915,7 +885,6 @@ class Hash
     /**
      * Returns the block length (in bytes)
      *
-     * @access public
      * @return int
      */
     public function getBlockLengthInBytes()
@@ -926,7 +895,6 @@ class Hash
     /**
      * Pads SHA3 based on the mode
      *
-     * @access private
      * @param int $padLength
      * @param int $padType
      * @return string
@@ -969,7 +937,6 @@ class Hash
      * capacity c". This is relevant because, altho the KECCAK standard defines a mode
      * (KECCAK-f[800]) designed for 32-bit machines that mode is incompatible with SHA3
      *
-     * @access private
      * @param string $p
      * @param int $c
      * @param int $r
@@ -1030,7 +997,6 @@ class Hash
     /**
      * 32-bit block processing method for SHA3
      *
-     * @access private
      * @param array $s
      */
     private static function processSHA3Block32(&$s)
@@ -1140,7 +1106,6 @@ class Hash
     /**
      * Rotate 32-bit int
      *
-     * @access private
      * @param array $x
      * @param int $shift
      */
@@ -1162,7 +1127,6 @@ class Hash
     /**
      * Pure-PHP 64-bit implementation of SHA3
      *
-     * @access private
      * @param string $p
      * @param int $c
      * @param int $r
@@ -1222,7 +1186,6 @@ class Hash
     /**
      * 64-bit block processing method for SHA3
      *
-     * @access private
      * @param array $s
      */
     private static function processSHA3Block64(&$s)
@@ -1309,7 +1272,6 @@ class Hash
     /**
      * Rotate 64-bit int
      *
-     * @access private
      * @param int $x
      * @param int $shift
      */
@@ -1321,7 +1283,6 @@ class Hash
     /**
      * Pure-PHP implementation of SHA512
      *
-     * @access private
      * @param string $m
      * @param array $hash
      * @return string
diff --git a/phpseclib/Crypt/PublicKeyLoader.php b/phpseclib/Crypt/PublicKeyLoader.php
index e1393c59..61afbaeb 100644
--- a/phpseclib/Crypt/PublicKeyLoader.php
+++ b/phpseclib/Crypt/PublicKeyLoader.php
@@ -5,8 +5,6 @@
  *
  * Returns a PublicKey or PrivateKey object.
  *
- * @category  Crypt
- * @package   PublicKeyLoader
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -24,9 +22,7 @@ use phpseclib3\File\X509;
 /**
  * PublicKeyLoader
  *
- * @package Common
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PublicKeyLoader
 {
@@ -34,7 +30,6 @@ abstract class PublicKeyLoader
      * Loads a public or private key
      *
      * @return AsymmetricKey
-     * @access public
      * @param string|array $key
      * @param string $password optional
      */
@@ -72,7 +67,6 @@ abstract class PublicKeyLoader
      * Loads a private key
      *
      * @return PrivateKey
-     * @access public
      * @param string|array $key
      * @param string $password optional
      */
@@ -89,7 +83,6 @@ abstract class PublicKeyLoader
      * Loads a public key
      *
      * @return PublicKey
-     * @access public
      * @param string|array $key
      */
     public static function loadPublicKey($key)
@@ -105,7 +98,6 @@ abstract class PublicKeyLoader
      * Loads parameters
      *
      * @return AsymmetricKey
-     * @access public
      * @param string|array $key
      */
     public static function loadParameters($key)
diff --git a/phpseclib/Crypt/RC2.php b/phpseclib/Crypt/RC2.php
index 0db9a74a..779a0e25 100644
--- a/phpseclib/Crypt/RC2.php
+++ b/phpseclib/Crypt/RC2.php
@@ -26,8 +26,6 @@
  * ?>
  * </code>
  *
- * @category Crypt
- * @package  RC2
  * @author   Patrick Monnerat <pm@datasphere.ch>
  * @license  http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link     http://phpseclib.sourceforge.net
@@ -41,8 +39,6 @@ use phpseclib3\Exception\BadModeException;
 /**
  * Pure-PHP implementation of RC2.
  *
- * @package RC2
- * @access  public
  */
 class RC2 extends BlockCipher
 {
@@ -51,7 +47,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
      * @var int
-     * @access private
      */
     protected $block_size = 8;
 
@@ -61,7 +56,6 @@ class RC2 extends BlockCipher
      * @see \phpseclib3\Crypt\Common\SymmetricKey::key
      * @see self::setKey()
      * @var string
-     * @access private
      */
     protected $key;
 
@@ -73,7 +67,6 @@ class RC2 extends BlockCipher
      * @see self::encrypt()
      * @see self::decrypt()
      * @var string
-     * @access private
      */
     private $orig_key;
 
@@ -82,7 +75,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::clearBuffers()
      * @var bool
-     * @access private
      */
     private $skip_key_adjustment = true;
 
@@ -91,7 +83,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\RC2::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 16; // = 128 bits
 
@@ -100,7 +91,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'rc2';
 
@@ -109,7 +99,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 500;
 
@@ -123,7 +112,6 @@ class RC2 extends BlockCipher
      * @see self::setKeyLength()
      * @see self::setKey()
      * @var int
-     * @access private
      */
     private $default_key_length = 1024;
 
@@ -135,7 +123,6 @@ class RC2 extends BlockCipher
      * @see self::isValidEnine()
      * @see self::setKey()
      * @var int
-     * @access private
      */
     private $current_key_length;
 
@@ -144,7 +131,6 @@ class RC2 extends BlockCipher
      *
      * @see self::setupKey()
      * @var array
-     * @access private
      */
     private $keys;
 
@@ -154,7 +140,6 @@ class RC2 extends BlockCipher
      *
      * @see self::setKey()
      * @var array
-     * @access private
      */
     private static $pitable = [
         0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
@@ -228,7 +213,6 @@ class RC2 extends BlockCipher
      *
      * @see self::setKey()
      * @var array
-     * @access private
      */
     private static $invpitable = [
         0xD1, 0xDA, 0xB9, 0x6F, 0x9C, 0xC8, 0x78, 0x66,
@@ -269,7 +253,6 @@ class RC2 extends BlockCipher
      * Default Constructor.
      *
      * @param string $mode
-     * @access public
      * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -288,7 +271,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -312,7 +294,6 @@ class RC2 extends BlockCipher
      * Calling this function after setting the key has no effect until the next
      *  \phpseclib3\Crypt\RC2::setKey() call.
      *
-     * @access public
      * @param int $length in bits
      * @throws \LengthException if the key length isn't supported
      */
@@ -329,7 +310,6 @@ class RC2 extends BlockCipher
     /**
      * Returns the current key length
      *
-     * @access public
      * @return int
      */
     public function getKeyLength()
@@ -346,7 +326,6 @@ class RC2 extends BlockCipher
      * it is empty.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
-     * @access public
      * @param string $key
      * @param int|boolean $t1 optional Effective key length in bits.
      * @throws \LengthException if the key length isn't supported
@@ -408,7 +387,6 @@ class RC2 extends BlockCipher
      * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::encrypt, with some additional OpenSSL handling code
      *
      * @see self::decrypt()
-     * @access public
      * @param string $plaintext
      * @return string $ciphertext
      */
@@ -431,7 +409,6 @@ class RC2 extends BlockCipher
      * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::decrypt, with some additional OpenSSL handling code
      *
      * @see self::encrypt()
-     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
@@ -453,7 +430,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encryptBlock()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @access private
      * @param string $in
      * @return string
      */
@@ -498,7 +474,6 @@ class RC2 extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decryptBlock()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     * @access private
      * @param string $in
      * @return string
      */
@@ -542,7 +517,6 @@ class RC2 extends BlockCipher
      * Creates the key schedule
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -563,7 +537,6 @@ class RC2 extends BlockCipher
      * Setup the performance-optimized function for de/encrypt()
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
-     * @access private
      */
     protected function setupInlineCrypt()
     {
diff --git a/phpseclib/Crypt/RC4.php b/phpseclib/Crypt/RC4.php
index d2d3a71c..f7ee7349 100644
--- a/phpseclib/Crypt/RC4.php
+++ b/phpseclib/Crypt/RC4.php
@@ -34,8 +34,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   RC4
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -49,20 +47,16 @@ use phpseclib3\Crypt\Common\StreamCipher;
 /**
  * Pure-PHP implementation of RC4.
  *
- * @package RC4
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class RC4 extends StreamCipher
 {
     /**
-     * @access private
      * @see \phpseclib3\Crypt\RC4::_crypt()
      */
     const ENCRYPT = 0;
 
     /**
-     * @access private
      * @see \phpseclib3\Crypt\RC4::_crypt()
      */
     const DECRYPT = 1;
@@ -72,7 +66,6 @@ class RC4 extends StreamCipher
      *
      * @see \phpseclib3\Crypt\RC4::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 128; // = 1024 bits
 
@@ -81,7 +74,6 @@ class RC4 extends StreamCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'arcfour';
 
@@ -90,7 +82,6 @@ class RC4 extends StreamCipher
      *
      * @see self::setKey()
      * @var string
-     * @access private
      */
     protected $key;
 
@@ -99,7 +90,6 @@ class RC4 extends StreamCipher
      *
      * @see self::setKey()
      * @var array
-     * @access private
      */
     private $stream;
 
@@ -110,7 +100,6 @@ class RC4 extends StreamCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -146,7 +135,6 @@ class RC4 extends StreamCipher
      *
      * Keys can be between 1 and 256 bytes long.
      *
-     * @access public
      * @param int $length
      * @throws \LengthException if the key length is invalid
      */
@@ -166,7 +154,6 @@ class RC4 extends StreamCipher
      *
      * Keys can be between 1 and 256 bytes long.
      *
-     * @access public
      * @param string $key
      */
     public function setKey($key)
@@ -184,7 +171,6 @@ class RC4 extends StreamCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
      * @see self::crypt()
-     * @access public
      * @param string $plaintext
      * @return string $ciphertext
      */
@@ -204,7 +190,6 @@ class RC4 extends StreamCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
      * @see self::crypt()
-     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
@@ -219,7 +204,6 @@ class RC4 extends StreamCipher
     /**
      * Encrypts a block
      *
-     * @access private
      * @param string $in
      */
     protected function encryptBlock($in)
@@ -230,7 +214,6 @@ class RC4 extends StreamCipher
     /**
      * Decrypts a block
      *
-     * @access private
      * @param string $in
      */
     protected function decryptBlock($in)
@@ -242,7 +225,6 @@ class RC4 extends StreamCipher
      * Setup the key (expansion)
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -270,7 +252,6 @@ class RC4 extends StreamCipher
      *
      * @see self::encrypt()
      * @see self::decrypt()
-     * @access private
      * @param string $text
      * @param int $mode
      * @return string $text
diff --git a/phpseclib/Crypt/RSA.php b/phpseclib/Crypt/RSA.php
index b3cb0ba6..e96ba359 100644
--- a/phpseclib/Crypt/RSA.php
+++ b/phpseclib/Crypt/RSA.php
@@ -45,8 +45,6 @@
  * decode an id-RSASSA-PSS key. For X.509 certificates the id-RSASSA-PSS
  * format is used by default (unless you change it up to use PKCS1 instead)
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -66,9 +64,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP PKCS#1 compliant implementation of RSA.
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RSA extends AsymmetricKey
 {
@@ -76,7 +72,6 @@ abstract class RSA extends AsymmetricKey
      * Algorithm Name
      *
      * @var string
-     * @access private
      */
     const ALGORITHM = 'RSA';
 
@@ -88,7 +83,6 @@ abstract class RSA extends AsymmetricKey
      *
      * @see self::setHash()
      * @see self::setMGFHash()
-     * @access public
      * @see self::encrypt()
      * @see self::decrypt()
      */
@@ -100,7 +94,6 @@ abstract class RSA extends AsymmetricKey
      * Although self::PADDING_OAEP / self::PADDING_PSS  offers more security, including PKCS#1 padding is necessary for purposes of backwards
      * compatibility with protocols (like SSH-1) written before OAEP's introduction.
      *
-     * @access public
      * @see self::encrypt()
      * @see self::decrypt()
      */
@@ -112,7 +105,6 @@ abstract class RSA extends AsymmetricKey
      * Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
      * stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
      *
-     * @access public
      * @see self::encrypt()
      * @see self::decrypt()
      */
@@ -129,7 +121,6 @@ abstract class RSA extends AsymmetricKey
      * @see self::sign()
      * @see self::verify()
      * @see self::setHash()
-     * @access public
      */
     const SIGNATURE_PSS = 16;
 
@@ -139,7 +130,6 @@ abstract class RSA extends AsymmetricKey
      * @see self::sign()
      * @see self::verify()
      * @see self::setHash()
-     * @access public
      */
     const SIGNATURE_RELAXED_PKCS1 = 32;
 
@@ -149,7 +139,6 @@ abstract class RSA extends AsymmetricKey
      * @see self::sign()
      * @see self::verify()
      * @see self::setHash()
-     * @access public
      */
     const SIGNATURE_PKCS1 = 64;
 
@@ -157,7 +146,6 @@ abstract class RSA extends AsymmetricKey
      * Encryption padding mode
      *
      * @var int
-     * @access private
      */
     protected $encryptionPadding = self::ENCRYPTION_OAEP;
 
@@ -165,7 +153,6 @@ abstract class RSA extends AsymmetricKey
      * Signature padding mode
      *
      * @var int
-     * @access private
      */
     protected $signaturePadding = self::SIGNATURE_PSS;
 
@@ -173,7 +160,6 @@ abstract class RSA extends AsymmetricKey
      * Length of hash function output
      *
      * @var int
-     * @access private
      */
     protected $hLen;
 
@@ -181,7 +167,6 @@ abstract class RSA extends AsymmetricKey
      * Length of salt
      *
      * @var int
-     * @access private
      */
     protected $sLen;
 
@@ -189,7 +174,6 @@ abstract class RSA extends AsymmetricKey
      * Label
      *
      * @var string
-     * @access private
      */
     protected $label = '';
 
@@ -197,7 +181,6 @@ abstract class RSA extends AsymmetricKey
      * Hash function for the Mask Generation Function
      *
      * @var \phpseclib3\Crypt\Hash
-     * @access private
      */
     protected $mgfHash;
 
@@ -205,7 +188,6 @@ abstract class RSA extends AsymmetricKey
      * Length of MGF hash function output
      *
      * @var int
-     * @access private
      */
     protected $mgfHLen;
 
@@ -213,7 +195,6 @@ abstract class RSA extends AsymmetricKey
      * Modulus (ie. n)
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $modulus;
 
@@ -221,7 +202,6 @@ abstract class RSA extends AsymmetricKey
      * Modulus length
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $k;
 
@@ -229,7 +209,6 @@ abstract class RSA extends AsymmetricKey
      * Exponent (ie. e or d)
      *
      * @var \phpseclib3\Math\BigInteger
-     * @access private
      */
     protected $exponent;
 
@@ -238,7 +217,6 @@ abstract class RSA extends AsymmetricKey
      *
      * @var int
      * @link http://en.wikipedia.org/wiki/65537_%28number%29
-     * @access private
      */
     private static $defaultExponent = 65537;
 
@@ -246,7 +224,6 @@ abstract class RSA extends AsymmetricKey
      * Enable Blinding?
      *
      * @var bool
-     * @access private
      */
     protected static $enableBlinding = true;
 
@@ -269,7 +246,6 @@ abstract class RSA extends AsymmetricKey
      * a chance neither gmp nor OpenSSL are installed)
      *
      * @var int
-     * @access private
      */
     private static $smallestPrime = 4096;
 
@@ -278,7 +254,6 @@ abstract class RSA extends AsymmetricKey
      *
      * This will be 65537 unless changed.
      *
-     * @access public
      * @param int $val
      */
     public static function setExponent($val)
@@ -291,7 +266,6 @@ abstract class RSA extends AsymmetricKey
      *
      * This will be 4096 unless changed.
      *
-     * @access public
      * @param int $val
      */
     public static function setSmallestPrime($val)
@@ -304,7 +278,6 @@ abstract class RSA extends AsymmetricKey
      *
      * Set to the empty string to use the default config file
      *
-     * @access public
      * @param string $val
      */
     public static function setOpenSSLConfigPath($val)
@@ -318,7 +291,6 @@ abstract class RSA extends AsymmetricKey
      * The public key can be extracted from the private key
      *
      * @return RSA
-     * @access public
      * @param int $bits
      */
     public static function createKey($bits = 2048)
@@ -450,7 +422,6 @@ abstract class RSA extends AsymmetricKey
      * OnLoad Handler
      *
      * @return bool
-     * @access protected
      * @param array $components
      */
     protected static function onLoad($components)
@@ -527,7 +498,6 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
      *
-     * @access private
      * @param bool|\phpseclib3\Math\BigInteger $x
      * @param int $xLen
      * @return bool|string
@@ -549,7 +519,6 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
      *
-     * @access private
      * @param string $x
      * @return \phpseclib3\Math\BigInteger
      */
@@ -563,7 +532,6 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
      *
-     * @access private
      * @param string $m
      * @param int $emLen
      * @throws \LengthException if the intended encoded message length is too short
@@ -627,7 +595,6 @@ abstract class RSA extends AsymmetricKey
      *  generally be omitted, but if present, it shall have a value of type
      *  NULL"
      *
-     * @access private
      * @param string $m
      * @param int $emLen
      * @return string
@@ -682,7 +649,6 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
      *
-     * @access private
      * @param string $mgfSeed
      * @param int $maskLen
      * @return string
@@ -706,7 +672,6 @@ abstract class RSA extends AsymmetricKey
      *
      * More specifically, this returns the size of the modulo in bits.
      *
-     * @access public
      * @return int
      */
     public function getLength()
@@ -720,7 +685,6 @@ abstract class RSA extends AsymmetricKey
      * Used with signature production / verification and (if the encryption mode is self::PADDING_OAEP) encryption and
      * decryption.
      *
-     * @access public
      * @param string $hash
      */
     public function withHash($hash)
@@ -756,7 +720,6 @@ abstract class RSA extends AsymmetricKey
      * The mask generation function is used by self::PADDING_OAEP and self::PADDING_PSS and although it's
      * best if Hash and MGFHash are set to the same thing this is not a requirement.
      *
-     * @access public
      * @param string $hash
      */
     public function withMGFHash($hash)
@@ -789,7 +752,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Returns the MGF hash algorithm currently being used
      *
-     * @access public
      */
     public function getMGFHash()
     {
@@ -806,7 +768,6 @@ abstract class RSA extends AsymmetricKey
      *    Typical salt lengths in octets are hLen (the length of the output
      *    of the hash function Hash) and 0.
      *
-     * @access public
      * @param int $sLen
      */
     public function withSaltLength($sLen)
@@ -819,7 +780,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Returns the salt length currently being used
      *
-     * @access public
      */
     public function getSaltLength()
     {
@@ -838,7 +798,6 @@ abstract class RSA extends AsymmetricKey
      *    the empty string; other uses of the label are outside the scope of
      *    this document.
      *
-     * @access public
      * @param string $label
      */
     public function withLabel($label)
@@ -851,7 +810,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Returns the label currently being used
      *
-     * @access public
      */
     public function getLabel()
     {
@@ -863,7 +821,6 @@ abstract class RSA extends AsymmetricKey
      *
      * Example: $key->withPadding(RSA::ENCRYPTION_PKCS1 | RSA::SIGNATURE_PKCS1);
      *
-     * @access public
      * @param int $padding
      */
     public function withPadding($padding)
@@ -913,7 +870,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Returns the padding currently being used
      *
-     * @access public
      */
     public function getPadding()
     {
@@ -930,7 +886,6 @@ abstract class RSA extends AsymmetricKey
      *
      * @see self::useInternalEngine()
      * @see self::useBestEngine()
-     * @access public
      * @return string
      */
     public function getEngine()
@@ -946,7 +901,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Enable RSA Blinding
      *
-     * @access public
      */
     public static function enableBlinding()
     {
@@ -956,7 +910,6 @@ abstract class RSA extends AsymmetricKey
     /**
      * Disable RSA Blinding
      *
-     * @access public
      */
     public static function disableBlinding()
     {
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
index 0d0b45c9..cbd810bb 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
@@ -9,8 +9,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -27,59 +25,49 @@ use phpseclib3\Math\BigInteger;
 /**
  * Microsoft BLOB Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class MSBLOB
 {
     /**
      * Public/Private Key Pair
      *
-     * @access private
      */
     const PRIVATEKEYBLOB = 0x7;
     /**
      * Public Key
      *
-     * @access private
      */
     const PUBLICKEYBLOB = 0x6;
     /**
      * Public Key
      *
-     * @access private
      */
     const PUBLICKEYBLOBEX = 0xA;
     /**
      * RSA public key exchange algorithm
      *
-     * @access private
      */
     const CALG_RSA_KEYX = 0x0000A400;
     /**
      * RSA public key exchange algorithm
      *
-     * @access private
      */
     const CALG_RSA_SIGN = 0x00002400;
     /**
      * Public Key
      *
-     * @access private
      */
     const RSA1 = 0x31415352;
     /**
      * Private Key
      *
-     * @access private
      */
     const RSA2 = 0x32415352;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -187,7 +175,6 @@ abstract class MSBLOB
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -225,7 +212,6 @@ abstract class MSBLOB
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @return string
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
index 73057803..2367810a 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
@@ -7,8 +7,6 @@
  *
  * Place in $HOME/.ssh/authorized_keys
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -24,9 +22,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * OpenSSH Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSH extends Progenitor
 {
@@ -40,7 +36,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -95,7 +90,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param array $options optional
@@ -118,7 +112,6 @@ abstract class OpenSSH extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
index b7dda78f..b35c7adb 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
@@ -14,8 +14,6 @@
  *
  * Analogous to ssh-keygen's pem format (as specified by -m)
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -33,16 +31,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#1 Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS1 extends Progenitor
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -107,7 +102,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -148,7 +142,6 @@ abstract class PKCS1 extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @return string
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
index 206edccd..7ff9a199 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
@@ -17,8 +17,6 @@
  * is specific to private keys it's basically creating a DER-encoded wrapper
  * for keys. This just extends that same concept to public keys (much like ssh-keygen)
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -35,9 +33,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#8 Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS8 extends Progenitor
 {
@@ -45,7 +41,6 @@ abstract class PKCS8 extends Progenitor
      * OID Name
      *
      * @var string
-     * @access private
      */
     const OID_NAME = 'rsaEncryption';
 
@@ -53,7 +48,6 @@ abstract class PKCS8 extends Progenitor
      * OID Value
      *
      * @var string
-     * @access private
      */
     const OID_VALUE = '1.2.840.113549.1.1.1';
 
@@ -61,14 +55,12 @@ abstract class PKCS8 extends Progenitor
      * Child OIDs loaded
      *
      * @var bool
-     * @access private
      */
     protected static $childOIDsLoaded = false;
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -113,7 +105,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -134,7 +125,6 @@ abstract class PKCS8 extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param array $options optional
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PSS.php b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
index 544ae845..ed75b9b7 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
@@ -15,8 +15,6 @@
  *
  * Analogous to "openssl genpkey -algorithm rsa-pss".
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -34,9 +32,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PKCS#8 Formatted RSA-PSS Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PSS extends Progenitor
 {
@@ -44,7 +40,6 @@ abstract class PSS extends Progenitor
      * OID Name
      *
      * @var string
-     * @access private
      */
     const OID_NAME = 'id-RSASSA-PSS';
 
@@ -52,7 +47,6 @@ abstract class PSS extends Progenitor
      * OID Value
      *
      * @var string
-     * @access private
      */
     const OID_VALUE = '1.2.840.113549.1.1.10';
 
@@ -60,7 +54,6 @@ abstract class PSS extends Progenitor
      * OIDs loaded
      *
      * @var bool
-     * @access private
      */
     private static $oidsLoaded = false;
 
@@ -68,7 +61,6 @@ abstract class PSS extends Progenitor
      * Child OIDs loaded
      *
      * @var bool
-     * @access private
      */
     protected static $childOIDsLoaded = false;
 
@@ -99,7 +91,6 @@ abstract class PSS extends Progenitor
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -163,7 +154,6 @@ abstract class PSS extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -187,7 +177,6 @@ abstract class PSS extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param array $options optional
@@ -206,7 +195,6 @@ abstract class PSS extends Progenitor
     /**
      * Encodes PSS parameters
      *
-     * @access public
      * @param array $options
      * @return string
      */
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
index cba85c30..fe35717b 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * PuTTY Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PuTTY extends Progenitor
 {
@@ -32,7 +28,6 @@ abstract class PuTTY extends Progenitor
      * Public Handler
      *
      * @var string
-     * @access private
      */
     const PUBLIC_HANDLER = 'phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH';
 
@@ -40,14 +35,12 @@ abstract class PuTTY extends Progenitor
      * Algorithm Identifier
      *
      * @var array
-     * @access private
      */
     protected static $types = ['ssh-rsa'];
 
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -92,7 +85,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -118,7 +110,6 @@ abstract class PuTTY extends Progenitor
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @return string
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/Raw.php b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
index 5ccef230..db728784 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
@@ -15,8 +15,6 @@
  *
  * 1, n, modulo, modulus
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -30,16 +28,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * Raw RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Raw
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -143,7 +138,6 @@ abstract class Raw
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -179,7 +173,6 @@ abstract class Raw
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @return array
diff --git a/phpseclib/Crypt/RSA/Formats/Keys/XML.php b/phpseclib/Crypt/RSA/Formats/Keys/XML.php
index 54ca27df..d9b7530e 100644
--- a/phpseclib/Crypt/RSA/Formats/Keys/XML.php
+++ b/phpseclib/Crypt/RSA/Formats/Keys/XML.php
@@ -12,8 +12,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -31,16 +29,13 @@ use phpseclib3\Math\BigInteger;
 /**
  * XML Formatted RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class XML
 {
     /**
      * Break a public or private key down into its constituent components
      *
-     * @access public
      * @param string $key
      * @param string $password optional
      * @return array
@@ -129,7 +124,6 @@ abstract class XML
     /**
      * Convert a private key to the appropriate format.
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @param \phpseclib3\Math\BigInteger $d
@@ -164,7 +158,6 @@ abstract class XML
     /**
      * Convert a public key to the appropriate format
      *
-     * @access public
      * @param \phpseclib3\Math\BigInteger $n
      * @param \phpseclib3\Math\BigInteger $e
      * @return string
diff --git a/phpseclib/Crypt/RSA/PrivateKey.php b/phpseclib/Crypt/RSA/PrivateKey.php
index a4390deb..b5e197af 100644
--- a/phpseclib/Crypt/RSA/PrivateKey.php
+++ b/phpseclib/Crypt/RSA/PrivateKey.php
@@ -3,8 +3,6 @@
 /**
  * RSA Private Key
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Raw RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PrivateKey extends RSA implements Common\PrivateKey
 {
@@ -35,7 +31,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Primes for Chinese Remainder Theorem (ie. p and q)
      *
      * @var array
-     * @access private
      */
     protected $primes;
 
@@ -43,7 +38,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
      *
      * @var array
-     * @access private
      */
     protected $exponents;
 
@@ -51,7 +45,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Coefficients for Chinese Remainder Theorem (ie. qInv)
      *
      * @var array
-     * @access private
      */
     protected $coefficients;
 
@@ -59,7 +52,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Public Exponent
      *
      * @var mixed
-     * @access private
      */
     protected $publicExponent = false;
 
@@ -68,7 +60,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $c
      * @return bool|\phpseclib3\Math\BigInteger
      */
@@ -85,7 +76,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $m
      * @return bool|\phpseclib3\Math\BigInteger
      */
@@ -181,7 +171,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Protects against timing attacks by employing RSA Blinding.
      * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $x
      * @param \phpseclib3\Math\BigInteger $r
      * @param int $i
@@ -205,7 +194,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
      *
      * @return string
-     * @access private
      * @param string $m
      * @throws \RuntimeException on encoding error
      * @param int $emBits
@@ -241,7 +229,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
      *
-     * @access private
      * @param string $m
      * @return bool|string
      */
@@ -267,7 +254,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
      *
-     * @access private
      * @param string $m
      * @throws \LengthException if the RSA modulus is too short
      * @return bool|string
@@ -299,7 +285,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Create a signature
      *
      * @see self::verify()
-     * @access public
      * @param string $message
      * @return string
      */
@@ -320,7 +305,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
      *
-     * @access private
      * @param string $c
      * @return bool|string
      */
@@ -370,7 +354,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *    ciphertext C, leading to a chosen-ciphertext attack such as the one
      *    observed by Manger [36].
      *
-     * @access private
      * @param string $c
      * @return bool|string
      */
@@ -429,7 +412,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      *
      * Doesn't use padding and is not recommended.
      *
-     * @access private
      * @param string $m
      * @return bool|string
      * @throws \LengthException if strlen($m) > $this->k
@@ -449,7 +431,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
      * Decryption
      *
      * @see self::encrypt()
-     * @access public
      * @param string $ciphertext
      * @return bool|string
      */
@@ -469,7 +450,6 @@ class PrivateKey extends RSA implements Common\PrivateKey
     /**
      * Returns the public key
      *
-     * @access public
      * @return mixed
      */
     public function getPublicKey()
diff --git a/phpseclib/Crypt/RSA/PublicKey.php b/phpseclib/Crypt/RSA/PublicKey.php
index 5a8c8f1f..89408792 100644
--- a/phpseclib/Crypt/RSA/PublicKey.php
+++ b/phpseclib/Crypt/RSA/PublicKey.php
@@ -3,8 +3,6 @@
 /**
  * RSA Public Key
  *
- * @category  Crypt
- * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -28,9 +26,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Raw RSA Key Handler
  *
- * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PublicKey extends RSA implements Common\PublicKey
 {
@@ -52,7 +48,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $s
      * @return bool|\phpseclib3\Math\BigInteger
      */
@@ -69,7 +64,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
      *
-     * @access private
      * @param string $m
      * @param string $s
      * @throws \LengthException if the RSA modulus is too short
@@ -138,7 +132,6 @@ class PublicKey extends RSA implements Common\PublicKey
      * $rsa->getLastPadding() and get RSA::PADDING_RELAXED_PKCS1 back instead of
      * RSA::PADDING_PKCS1... that means BER encoding was used.
      *
-     * @access private
      * @param string $m
      * @param string $s
      * @return bool
@@ -224,7 +217,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
      *
-     * @access private
      * @param string $m
      * @param string $em
      * @param int $emBits
@@ -271,7 +263,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
      *
-     * @access private
      * @param string $m
      * @param string $s
      * @return bool|string
@@ -326,7 +317,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
      *
-     * @access private
      * @param string $m
      * @param bool $pkcs15_compat optional
      * @throws \LengthException if strlen($m) > $this->k - 11
@@ -370,7 +360,6 @@ class PublicKey extends RSA implements Common\PublicKey
      * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
      * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
      *
-     * @access private
      * @param string $m
      * @throws \LengthException if strlen($m) > $this->k - 2 * $this->hLen - 2
      * @return string
@@ -416,7 +405,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
      *
-     * @access private
      * @param \phpseclib3\Math\BigInteger $m
      * @return bool|\phpseclib3\Math\BigInteger
      */
@@ -433,7 +421,6 @@ class PublicKey extends RSA implements Common\PublicKey
      *
      * Doesn't use padding and is not recommended.
      *
-     * @access private
      * @param string $m
      * @return bool|string
      * @throws \LengthException if strlen($m) > $this->k
@@ -457,7 +444,6 @@ class PublicKey extends RSA implements Common\PublicKey
      * be concatenated together.
      *
      * @see self::decrypt()
-     * @access public
      * @param string $plaintext
      * @return bool|string
      * @throws \LengthException if the RSA modulus is too short
diff --git a/phpseclib/Crypt/Random.php b/phpseclib/Crypt/Random.php
index 8bcaa8da..e2c3cb59 100644
--- a/phpseclib/Crypt/Random.php
+++ b/phpseclib/Crypt/Random.php
@@ -14,8 +14,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Random
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -27,9 +25,7 @@ namespace phpseclib3\Crypt;
 /**
  * Pure-PHP Random Number Generator
  *
- * @package Random
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Random
 {
diff --git a/phpseclib/Crypt/Rijndael.php b/phpseclib/Crypt/Rijndael.php
index 90994869..2c069866 100644
--- a/phpseclib/Crypt/Rijndael.php
+++ b/phpseclib/Crypt/Rijndael.php
@@ -44,8 +44,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Rijndael
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -64,9 +62,7 @@ use phpseclib3\Exception\InsufficientSetupException;
 /**
  * Pure-PHP implementation of Rijndael.
  *
- * @package Rijndael
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Rijndael extends BlockCipher
 {
@@ -82,7 +78,6 @@ class Rijndael extends BlockCipher
      * @see \phpseclib3\Crypt\Common\SymmetricKey::engine
      * @see self::isValidEngine()
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'rijndael-128';
 
@@ -91,7 +86,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::setup()
      * @var array
-     * @access private
      */
     private $w;
 
@@ -100,7 +94,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::setup()
      * @var array
-     * @access private
      */
     private $dw;
 
@@ -114,7 +107,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::setBlockLength()
      * @var int
-     * @access private
      */
     private $Nb = 4;
 
@@ -128,7 +120,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 16;
 
@@ -137,7 +128,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::setKeyLength()
      * @var int
-     * @access private
      * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
      */
     private $Nk = 4;
@@ -148,7 +138,6 @@ class Rijndael extends BlockCipher
      * {@internal The max value is 14, the min value is 10.}
      *
      * @var int
-     * @access private
      */
     private $Nr;
 
@@ -156,7 +145,6 @@ class Rijndael extends BlockCipher
      * Shift offsets
      *
      * @var array
-     * @access private
      */
     private $c;
 
@@ -164,7 +152,6 @@ class Rijndael extends BlockCipher
      * Holds the last used key- and block_size information
      *
      * @var array
-     * @access private
      */
     private $kl;
 
@@ -172,7 +159,6 @@ class Rijndael extends BlockCipher
      * Default Constructor.
      *
      * @param string $mode
-     * @access public
      * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -200,7 +186,6 @@ class Rijndael extends BlockCipher
      *             the mcrypt php extension, even if available.
      *             This results then in slower encryption.
      *
-     * @access public
      * @throws \LengthException if the key length is invalid
      * @param int $length
      */
@@ -227,7 +212,6 @@ class Rijndael extends BlockCipher
      * Rijndael supports five different key lengths
      *
      * @see setKeyLength()
-     * @access public
      * @param string $key
      * @throws \LengthException if the key length isn't supported
      */
@@ -252,7 +236,6 @@ class Rijndael extends BlockCipher
      *
      * Valid block lengths are 128, 160, 192, 224, and 256.
      *
-     * @access public
      * @param int $length
      */
     public function setBlockLength($length)
@@ -281,7 +264,6 @@ class Rijndael extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -324,7 +306,6 @@ class Rijndael extends BlockCipher
     /**
      * Encrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -414,7 +395,6 @@ class Rijndael extends BlockCipher
     /**
      * Decrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -514,7 +494,6 @@ class Rijndael extends BlockCipher
      * @see self::setKey()
      * @see self::setIV()
      * @see self::disableContinuousBuffer()
-     * @access private
      */
     protected function setup()
     {
@@ -533,7 +512,6 @@ class Rijndael extends BlockCipher
      * Setup the key (expansion)
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -646,7 +624,6 @@ class Rijndael extends BlockCipher
      * Performs S-Box substitutions
      *
      * @return array
-     * @access private
      * @param int $word
      */
     private function subWord($word)
@@ -668,7 +645,6 @@ class Rijndael extends BlockCipher
      * @see self::encryptBlock()
      * @see self::setupInlineCrypt()
      * @see self::subWord()
-     * @access private
      * @return array &$tables
      */
     protected function &getTables()
@@ -757,7 +733,6 @@ class Rijndael extends BlockCipher
      * @see self::decryptBlock()
      * @see self::setupInlineCrypt()
      * @see self::setupKey()
-     * @access private
      * @return array &$tables
      */
     protected function &getInvTables()
@@ -839,7 +814,6 @@ class Rijndael extends BlockCipher
      * Setup the performance-optimized function for de/encrypt()
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
-     * @access private
      */
     protected function setupInlineCrypt()
     {
@@ -982,7 +956,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::decrypt()
      * @see parent::encrypt()
-     * @access public
      * @param string $plaintext
      * @return string
      */
@@ -1014,7 +987,6 @@ class Rijndael extends BlockCipher
      *
      * @see self::encrypt()
      * @see parent::decrypt()
-     * @access public
      * @param string $ciphertext
      * @return string
      */
diff --git a/phpseclib/Crypt/Salsa20.php b/phpseclib/Crypt/Salsa20.php
index 98a6e4c2..d3e7a193 100644
--- a/phpseclib/Crypt/Salsa20.php
+++ b/phpseclib/Crypt/Salsa20.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Crypt
- * @package   Salsa20
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2019 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ use phpseclib3\Exception\InsufficientSetupException;
 /**
  * Pure-PHP implementation of Salsa20.
  *
- * @package Salsa20
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Salsa20 extends StreamCipher
 {
@@ -51,13 +47,11 @@ class Salsa20 extends StreamCipher
     protected $key_length = 32; // = 256 bits
 
     /**
-     * @access private
      * @see \phpseclib3\Crypt\Salsa20::crypt()
      */
     const ENCRYPT = 0;
 
     /**
-     * @access private
      * @see \phpseclib3\Crypt\Salsa20::crypt()
      */
     const DECRYPT = 1;
@@ -495,7 +489,6 @@ class Salsa20 extends StreamCipher
      *
      * @see self::decrypt()
      * @see self::encrypt()
-     * @access private
      * @param string $ciphertext
      * @return string
      */
diff --git a/phpseclib/Crypt/TripleDES.php b/phpseclib/Crypt/TripleDES.php
index bbb4a610..1ff5ed02 100644
--- a/phpseclib/Crypt/TripleDES.php
+++ b/phpseclib/Crypt/TripleDES.php
@@ -26,8 +26,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   TripleDES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -39,9 +37,7 @@ namespace phpseclib3\Crypt;
 /**
  * Pure-PHP implementation of Triple DES.
  *
- * @package TripleDES
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class TripleDES extends DES
 {
@@ -64,7 +60,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\TripleDES::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 24;
 
@@ -74,7 +69,6 @@ class TripleDES extends DES
      * @see \phpseclib3\Crypt\DES::cipher_name_mcrypt
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'tripledes';
 
@@ -83,7 +77,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 750;
 
@@ -93,7 +86,6 @@ class TripleDES extends DES
      * @see self::setKey()
      * @see \phpseclib3\Crypt\DES::setKey()
      * @var string
-     * @access private
      */
     protected $key_length_max = 24;
 
@@ -101,7 +93,6 @@ class TripleDES extends DES
      * Internal flag whether using self::MODE_3CBC or not
      *
      * @var bool
-     * @access private
      */
     private $mode_3cbc;
 
@@ -111,7 +102,6 @@ class TripleDES extends DES
      * Used only if $mode_3cbc === true
      *
      * @var array
-     * @access private
      */
     private $des;
 
@@ -139,7 +129,6 @@ class TripleDES extends DES
      * @see \phpseclib3\Crypt\DES::__construct()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param string $mode
-     * @access public
      */
     public function __construct($mode)
     {
@@ -182,7 +171,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @param int $engine
-     * @access protected
      * @return bool
      */
     protected function isValidEngineHelper($engine)
@@ -202,7 +190,6 @@ class TripleDES extends DES
      * SetIV is not required when \phpseclib3\Crypt\Common\SymmetricKey::MODE_ECB is being used.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setIV()
-     * @access public
      * @param string $iv
      */
     public function setIV($iv)
@@ -223,7 +210,6 @@ class TripleDES extends DES
      * If you want to use a 64-bit key use DES.php
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey:setKeyLength()
-     * @access public
      * @throws \LengthException if the key length is invalid
      * @param int $length
      */
@@ -247,7 +233,6 @@ class TripleDES extends DES
      *
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
-     * @access public
      * @see \phpseclib3\Crypt\DES::setKey()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
      * @throws \LengthException if the key length is invalid
@@ -286,7 +271,6 @@ class TripleDES extends DES
      * Encrypts a message.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @access public
      * @param string $plaintext
      * @return string $cipertext
      */
@@ -313,7 +297,6 @@ class TripleDES extends DES
      * Decrypts a message.
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
@@ -370,7 +353,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::enableContinuousBuffer()
      * @see self::disableContinuousBuffer()
-     * @access public
      */
     public function enableContinuousBuffer()
     {
@@ -389,7 +371,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::disableContinuousBuffer()
      * @see self::enableContinuousBuffer()
-     * @access public
      */
     public function disableContinuousBuffer()
     {
@@ -406,7 +387,6 @@ class TripleDES extends DES
      *
      * @see \phpseclib3\Crypt\DES::setupKey()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -442,7 +422,6 @@ class TripleDES extends DES
      * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
      * @see \phpseclib3\Crypt\Common\SymmetricKey::setPreferredEngine()
      * @param int $engine
-     * @access public
      */
     public function setPreferredEngine($engine)
     {
diff --git a/phpseclib/Crypt/Twofish.php b/phpseclib/Crypt/Twofish.php
index 1673ce96..efa47f8c 100644
--- a/phpseclib/Crypt/Twofish.php
+++ b/phpseclib/Crypt/Twofish.php
@@ -26,8 +26,6 @@
  * ?>
  * </code>
  *
- * @category  Crypt
- * @package   Twofish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -43,10 +41,8 @@ use phpseclib3\Exception\BadModeException;
 /**
  * Pure-PHP implementation of Twofish.
  *
- * @package Twofish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- * @access  public
  */
 class Twofish extends BlockCipher
 {
@@ -55,7 +51,6 @@ class Twofish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
      * @var string
-     * @access private
      */
     protected $cipher_name_mcrypt = 'twofish';
 
@@ -64,7 +59,6 @@ class Twofish extends BlockCipher
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
      * @var int
-     * @access private
      */
     protected $cfb_init_len = 800;
 
@@ -72,7 +66,6 @@ class Twofish extends BlockCipher
      * Q-Table
      *
      * @var array
-     * @access private
      */
     private static $q0 = [
         0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
@@ -113,7 +106,6 @@ class Twofish extends BlockCipher
      * Q-Table
      *
      * @var array
-     * @access private
      */
     private static $q1 = [
         0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
@@ -154,7 +146,6 @@ class Twofish extends BlockCipher
      * M-Table
      *
      * @var array
-     * @access private
      */
     private static $m0 = [
         0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
@@ -195,7 +186,6 @@ class Twofish extends BlockCipher
      * M-Table
      *
      * @var array
-     * @access private
      */
     private static $m1 = [
         0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
@@ -236,7 +226,6 @@ class Twofish extends BlockCipher
      * M-Table
      *
      * @var array
-     * @access private
      */
     private static $m2 = [
         0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
@@ -277,7 +266,6 @@ class Twofish extends BlockCipher
      * M-Table
      *
      * @var array
-     * @access private
      */
     private static $m3 = [
         0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
@@ -318,7 +306,6 @@ class Twofish extends BlockCipher
      * The Key Schedule Array
      *
      * @var array
-     * @access private
      */
     private $K = [];
 
@@ -326,7 +313,6 @@ class Twofish extends BlockCipher
      * The Key depended S-Table 0
      *
      * @var array
-     * @access private
      */
     private $S0 = [];
 
@@ -334,7 +320,6 @@ class Twofish extends BlockCipher
      * The Key depended S-Table 1
      *
      * @var array
-     * @access private
      */
     private $S1 = [];
 
@@ -342,7 +327,6 @@ class Twofish extends BlockCipher
      * The Key depended S-Table 2
      *
      * @var array
-     * @access private
      */
     private $S2 = [];
 
@@ -350,7 +334,6 @@ class Twofish extends BlockCipher
      * The Key depended S-Table 3
      *
      * @var array
-     * @access private
      */
     private $S3 = [];
 
@@ -358,7 +341,6 @@ class Twofish extends BlockCipher
      * Holds the last used key
      *
      * @var array
-     * @access private
      */
     private $kl;
 
@@ -367,7 +349,6 @@ class Twofish extends BlockCipher
      *
      * @see Crypt_Twofish::setKeyLength()
      * @var int
-     * @access private
      */
     protected $key_length = 16;
 
@@ -375,7 +356,6 @@ class Twofish extends BlockCipher
      * Default Constructor.
      *
      * @param string $mode
-     * @access public
      * @throws BadModeException if an invalid / unsupported mode is provided
      */
     public function __construct($mode)
@@ -392,7 +372,6 @@ class Twofish extends BlockCipher
      *
      * Valid key lengths are 128, 192 or 256 bits
      *
-     * @access public
      * @param int $length
      */
     public function setKeyLength($length)
@@ -415,7 +394,6 @@ class Twofish extends BlockCipher
      * Rijndael supports five different key lengths
      *
      * @see setKeyLength()
-     * @access public
      * @param string $key
      * @throws \LengthException if the key length isn't supported
      */
@@ -437,7 +415,6 @@ class Twofish extends BlockCipher
      * Setup the key (expansion)
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
-     * @access private
      */
     protected function setupKey()
     {
@@ -549,7 +526,6 @@ class Twofish extends BlockCipher
     /**
      * _mdsrem function using by the twofish cipher algorithm
      *
-     * @access private
      * @param string $A
      * @param string $B
      * @return array
@@ -597,7 +573,6 @@ class Twofish extends BlockCipher
     /**
      * Encrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -653,7 +628,6 @@ class Twofish extends BlockCipher
     /**
      * Decrypts a block
      *
-     * @access private
      * @param string $in
      * @return string
      */
@@ -710,7 +684,6 @@ class Twofish extends BlockCipher
      * Setup the performance-optimized function for de/encrypt()
      *
      * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupInlineCrypt()
-     * @access private
      */
     protected function setupInlineCrypt()
     {
diff --git a/phpseclib/Exception/BadConfigurationException.php b/phpseclib/Exception/BadConfigurationException.php
index fa5a818a..1aabcae0 100644
--- a/phpseclib/Exception/BadConfigurationException.php
+++ b/phpseclib/Exception/BadConfigurationException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   BadConfigurationException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * BadConfigurationException
  *
- * @package BadConfigurationException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class BadConfigurationException extends \RuntimeException
diff --git a/phpseclib/Exception/BadDecryptionException.php b/phpseclib/Exception/BadDecryptionException.php
index c1171b15..88331dce 100644
--- a/phpseclib/Exception/BadDecryptionException.php
+++ b/phpseclib/Exception/BadDecryptionException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   BadDecryptionException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * BadDecryptionException
  *
- * @package BadDecryptionException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class BadDecryptionException extends \RuntimeException
diff --git a/phpseclib/Exception/BadModeException.php b/phpseclib/Exception/BadModeException.php
index ace9f578..87689b22 100644
--- a/phpseclib/Exception/BadModeException.php
+++ b/phpseclib/Exception/BadModeException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   BadModeException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * BadModeException
  *
- * @package BadModeException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class BadModeException extends \RuntimeException
diff --git a/phpseclib/Exception/ConnectionClosedException.php b/phpseclib/Exception/ConnectionClosedException.php
index d6300d5c..6aaccbad 100644
--- a/phpseclib/Exception/ConnectionClosedException.php
+++ b/phpseclib/Exception/ConnectionClosedException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   ConnectionClosedException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * ConnectionClosedException
  *
- * @package ConnectionClosedException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class ConnectionClosedException extends \RuntimeException
diff --git a/phpseclib/Exception/FileNotFoundException.php b/phpseclib/Exception/FileNotFoundException.php
index bc1b9189..66e72709 100644
--- a/phpseclib/Exception/FileNotFoundException.php
+++ b/phpseclib/Exception/FileNotFoundException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   FileNotFoundException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * FileNotFoundException
  *
- * @package FileNotFoundException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class FileNotFoundException extends \RuntimeException
diff --git a/phpseclib/Exception/InconsistentSetupException.php b/phpseclib/Exception/InconsistentSetupException.php
index 77db4a0e..23c38fb0 100644
--- a/phpseclib/Exception/InconsistentSetupException.php
+++ b/phpseclib/Exception/InconsistentSetupException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   InconsistentSetupException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * InconsistentSetupException
  *
- * @package InconsistentSetupException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class InconsistentSetupException extends \RuntimeException
diff --git a/phpseclib/Exception/InsufficientSetupException.php b/phpseclib/Exception/InsufficientSetupException.php
index 27f49f2f..4f4114d7 100644
--- a/phpseclib/Exception/InsufficientSetupException.php
+++ b/phpseclib/Exception/InsufficientSetupException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   InsufficientSetupException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * InsufficientSetupException
  *
- * @package InsufficientSetupException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class InsufficientSetupException extends \RuntimeException
diff --git a/phpseclib/Exception/NoKeyLoadedException.php b/phpseclib/Exception/NoKeyLoadedException.php
index 95152eb4..7ec2fe9b 100644
--- a/phpseclib/Exception/NoKeyLoadedException.php
+++ b/phpseclib/Exception/NoKeyLoadedException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   NoKeyLoadedException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * NoKeyLoadedException
  *
- * @package NoKeyLoadedException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class NoKeyLoadedException extends \RuntimeException
diff --git a/phpseclib/Exception/NoSupportedAlgorithmsException.php b/phpseclib/Exception/NoSupportedAlgorithmsException.php
index 7a7471dc..b3ea8f38 100644
--- a/phpseclib/Exception/NoSupportedAlgorithmsException.php
+++ b/phpseclib/Exception/NoSupportedAlgorithmsException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   NoSupportedAlgorithmsException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * NoSupportedAlgorithmsException
  *
- * @package NoSupportedAlgorithmsException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class NoSupportedAlgorithmsException extends \RuntimeException
diff --git a/phpseclib/Exception/UnableToConnectException.php b/phpseclib/Exception/UnableToConnectException.php
index 909ef67f..bfa005b4 100644
--- a/phpseclib/Exception/UnableToConnectException.php
+++ b/phpseclib/Exception/UnableToConnectException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnableToConnectException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * UnableToConnectException
  *
- * @package UnableToConnectException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class UnableToConnectException extends \RuntimeException
diff --git a/phpseclib/Exception/UnsupportedAlgorithmException.php b/phpseclib/Exception/UnsupportedAlgorithmException.php
index e0c07a43..210a9a5c 100644
--- a/phpseclib/Exception/UnsupportedAlgorithmException.php
+++ b/phpseclib/Exception/UnsupportedAlgorithmException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnsupportedAlgorithmException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * UnsupportedAlgorithmException
  *
- * @package UnsupportedAlgorithmException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class UnsupportedAlgorithmException extends \RuntimeException
diff --git a/phpseclib/Exception/UnsupportedCurveException.php b/phpseclib/Exception/UnsupportedCurveException.php
index 6d746ab1..99152152 100644
--- a/phpseclib/Exception/UnsupportedCurveException.php
+++ b/phpseclib/Exception/UnsupportedCurveException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnsupportedCurveException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * UnsupportedCurveException
  *
- * @package UnsupportedCurveException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class UnsupportedCurveException extends \RuntimeException
diff --git a/phpseclib/Exception/UnsupportedFormatException.php b/phpseclib/Exception/UnsupportedFormatException.php
index f58f812d..e207d7e2 100644
--- a/phpseclib/Exception/UnsupportedFormatException.php
+++ b/phpseclib/Exception/UnsupportedFormatException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnsupportedFormatException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * UnsupportedFormatException
  *
- * @package UnsupportedFormatException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class UnsupportedFormatException extends \RuntimeException
diff --git a/phpseclib/Exception/UnsupportedOperationException.php b/phpseclib/Exception/UnsupportedOperationException.php
index 7872a1a8..9a115444 100644
--- a/phpseclib/Exception/UnsupportedOperationException.php
+++ b/phpseclib/Exception/UnsupportedOperationException.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  Exception
- * @package   UnsupportedOperationException
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,7 +16,6 @@ namespace phpseclib3\Exception;
 /**
  * UnsupportedOperationException
  *
- * @package UnsupportedOperationException
  * @author  Jim Wigginton <terrafrost@php.net>
  */
 class UnsupportedOperationException extends \RuntimeException
diff --git a/phpseclib/File/ANSI.php b/phpseclib/File/ANSI.php
index ab29c720..4f940b76 100644
--- a/phpseclib/File/ANSI.php
+++ b/phpseclib/File/ANSI.php
@@ -10,8 +10,6 @@
  * {@link http://en.wikipedia.org/wiki/Terminal_emulator terminal emulator} how to format the characters, what
  * color to display them in, etc. \phpseclib3\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
  *
- * @category  File
- * @package   ANSI
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ namespace phpseclib3\File;
 /**
  * Pure-PHP ANSI Decoder
  *
- * @package ANSI
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class ANSI
 {
@@ -33,7 +29,6 @@ class ANSI
      * Max Width
      *
      * @var int
-     * @access private
      */
     private $max_x;
 
@@ -41,7 +36,6 @@ class ANSI
      * Max Height
      *
      * @var int
-     * @access private
      */
     private $max_y;
 
@@ -49,7 +43,6 @@ class ANSI
      * Max History
      *
      * @var int
-     * @access private
      */
     private $max_history;
 
@@ -57,7 +50,6 @@ class ANSI
      * History
      *
      * @var array
-     * @access private
      */
     private $history;
 
@@ -65,7 +57,6 @@ class ANSI
      * History Attributes
      *
      * @var array
-     * @access private
      */
     private $history_attrs;
 
@@ -73,7 +64,6 @@ class ANSI
      * Current Column
      *
      * @var int
-     * @access private
      */
     private $x;
 
@@ -81,7 +71,6 @@ class ANSI
      * Current Row
      *
      * @var int
-     * @access private
      */
     private $y;
 
@@ -89,7 +78,6 @@ class ANSI
      * Old Column
      *
      * @var int
-     * @access private
      */
     private $old_x;
 
@@ -97,7 +85,6 @@ class ANSI
      * Old Row
      *
      * @var int
-     * @access private
      */
     private $old_y;
 
@@ -105,7 +92,6 @@ class ANSI
      * An empty attribute cell
      *
      * @var object
-     * @access private
      */
     private $base_attr_cell;
 
@@ -113,7 +99,6 @@ class ANSI
      * The current attribute cell
      *
      * @var object
-     * @access private
      */
     private $attr_cell;
 
@@ -121,7 +106,6 @@ class ANSI
      * An empty attribute row
      *
      * @var array
-     * @access private
      */
     private $attr_row;
 
@@ -129,7 +113,6 @@ class ANSI
      * The current screen text
      *
      * @var list<string>
-     * @access private
      */
     private $screen;
 
@@ -137,7 +120,6 @@ class ANSI
      * The current screen attributes
      *
      * @var array
-     * @access private
      */
     private $attrs;
 
@@ -145,7 +127,6 @@ class ANSI
      * Current ANSI code
      *
      * @var string
-     * @access private
      */
     private $ansi;
 
@@ -153,7 +134,6 @@ class ANSI
      * Tokenization
      *
      * @var array
-     * @access private
      */
     private $tokenization;
 
@@ -161,7 +141,6 @@ class ANSI
      * Default Constructor.
      *
      * @return \phpseclib3\File\ANSI
-     * @access public
      */
     public function __construct()
     {
@@ -186,7 +165,6 @@ class ANSI
      *
      * @param int $x
      * @param int $y
-     * @access public
      */
     public function setDimensions($x, $y)
     {
@@ -204,7 +182,6 @@ class ANSI
      * Set the number of lines that should be logged past the terminal height
      *
      * @param int $history
-     * @access public
      */
     public function setHistory($history)
     {
@@ -215,7 +192,6 @@ class ANSI
      * Load a string
      *
      * @param string $source
-     * @access public
      */
     public function loadString($source)
     {
@@ -227,7 +203,6 @@ class ANSI
      * Appdend a string
      *
      * @param string $source
-     * @access public
      */
     public function appendString($source)
     {
@@ -433,7 +408,6 @@ class ANSI
      *
      * Also update the $this->screen and $this->history buffers
      *
-     * @access private
      */
     private function newLine()
     {
@@ -461,7 +435,6 @@ class ANSI
     /**
      * Returns the current coordinate without preformating
      *
-     * @access private
      * @param \stdClass $last_attr
      * @param \stdClass $cur_attr
      * @param string $char
@@ -521,7 +494,6 @@ class ANSI
     /**
      * Returns the current screen without preformating
      *
-     * @access private
      * @return string
      */
     private function getScreenHelper()
@@ -545,7 +517,6 @@ class ANSI
     /**
      * Returns the current screen
      *
-     * @access public
      * @return string
      */
     public function getScreen()
@@ -556,7 +527,6 @@ class ANSI
     /**
      * Returns the current screen and the x previous lines
      *
-     * @access public
      * @return string
      */
     public function getHistory()
diff --git a/phpseclib/File/ASN1.php b/phpseclib/File/ASN1.php
index 57644cc3..8915ad0b 100644
--- a/phpseclib/File/ASN1.php
+++ b/phpseclib/File/ASN1.php
@@ -13,8 +13,6 @@
  *
  * Uses the 1988 ASN.1 syntax.
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -32,9 +30,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP ASN.1 Parser
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ASN1
 {
@@ -88,7 +84,6 @@ abstract class ASN1
      * ASN.1 object identifiers
      *
      * @var array
-     * @access private
      * @link http://en.wikipedia.org/wiki/Object_identifier
      */
     private static $oids = [];
@@ -97,7 +92,6 @@ abstract class ASN1
      * ASN.1 object identifier reverse mapping
      *
      * @var array
-     * @access private
      */
     private static $reverseOIDs = [];
 
@@ -105,7 +99,6 @@ abstract class ASN1
      * Default date format
      *
      * @var string
-     * @access private
      * @link http://php.net/class.datetime
      */
     private static $format = 'D, d M Y H:i:s O';
@@ -116,7 +109,6 @@ abstract class ASN1
      * If the mapping type is self::TYPE_ANY what do we actually encode it as?
      *
      * @var array
-     * @access private
      * @see self::encode_der()
      */
     private static $filters;
@@ -127,7 +119,6 @@ abstract class ASN1
      * Useful for debug purposes
      *
      * @var array
-     * @access private
      * @see self::encode_der()
      */
     private static $location;
@@ -138,7 +129,6 @@ abstract class ASN1
      * In case we need to create ASN1\Element object's..
      *
      * @var string
-     * @access private
      * @see self::decodeDER()
      */
     private static $encoded;
@@ -151,7 +141,6 @@ abstract class ASN1
      * Others are mapped as a choice, with an extra indexing level.
      *
      * @var array
-     * @access public
      */
     const ANY_MAP = [
         self::TYPE_BOOLEAN              => true,
@@ -185,7 +174,6 @@ abstract class ASN1
      * size == 0 indicates variable length encoding.
      *
      * @var array
-     * @access public
      */
     const STRING_TYPE_SIZE = [
         self::TYPE_UTF8_STRING      => 0,
@@ -204,7 +192,6 @@ abstract class ASN1
      *
      * @param Element|string $encoded
      * @return array
-     * @access public
      */
     public static function decodeBER($encoded)
     {
@@ -231,7 +218,6 @@ abstract class ASN1
      * @param int $start
      * @param int $encoded_pos
      * @return array|bool
-     * @access private
      */
     private static function decode_ber($encoded, $start = 0, $encoded_pos = 0)
     {
@@ -529,7 +515,6 @@ abstract class ASN1
      * @param array $mapping
      * @param array $special
      * @return array|bool|Element|string|null
-     * @access public
      */
     public static function asn1map($decoded, $mapping, $special = [])
     {
@@ -827,7 +812,6 @@ abstract class ASN1
      * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
      * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
      *
-     * @access public
      * @param string $string
      * @return int
      */
@@ -854,7 +838,6 @@ abstract class ASN1
      * @param array $mapping
      * @param array $special
      * @return string
-     * @access public
      */
     public static function encodeDER($source, $mapping, $special = [])
     {
@@ -870,7 +853,6 @@ abstract class ASN1
      * @param int $idx
      * @param array $special
      * @return string
-     * @access private
      */
     private static function encode_der($source, $mapping, $idx = null, $special = [])
     {
@@ -1157,7 +1139,6 @@ abstract class ASN1
      *
      * Called by _decode_ber()
      *
-     * @access public
      * @param string $content
      * @return string
      */
@@ -1210,7 +1191,6 @@ abstract class ASN1
      *
      * Called by _encode_der()
      *
-     * @access public
      * @param string $source
      * @return string
      */
@@ -1268,7 +1248,6 @@ abstract class ASN1
      *
      * Called by _decode_ber() and in the case of implicit tags asn1map().
      *
-     * @access private
      * @param string $content
      * @param int $tag
      * @return \DateTime|false
@@ -1316,7 +1295,6 @@ abstract class ASN1
      *
      * Sets the time / date format for asn1map().
      *
-     * @access public
      * @param string $format
      */
     public static function setTimeFormat($format)
@@ -1330,7 +1308,6 @@ abstract class ASN1
      * Load the relevant OIDs for a particular ASN.1 semantic mapping.
      * Previously loaded OIDs are retained.
      *
-     * @access public
      * @param array $oids
      */
     public static function loadOIDs($oids)
@@ -1345,7 +1322,6 @@ abstract class ASN1
      * See \phpseclib3\File\X509, etc, for an example.
      * Previously loaded filters are not retained.
      *
-     * @access public
      * @param array $filters
      */
     public static function setFilters($filters)
@@ -1363,7 +1339,6 @@ abstract class ASN1
      * @param int $from
      * @param int $to
      * @return string
-     * @access public
      */
     public static function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
     {
@@ -1465,7 +1440,6 @@ abstract class ASN1
     /**
      * Extract raw BER from Base64 encoding
      *
-     * @access private
      * @param string $str
      * @return string
      */
@@ -1500,7 +1474,6 @@ abstract class ASN1
      * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
      * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
      *
-     * @access public
      * @param int $length
      * @return string
      */
@@ -1529,7 +1502,6 @@ abstract class ASN1
      * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
      * getOID('zzz') == 'zzz'
      *
-     * @access public
      * @param string $name
      * @return string
      */
diff --git a/phpseclib/File/ASN1/Element.php b/phpseclib/File/ASN1/Element.php
index ade26ae5..6540b421 100644
--- a/phpseclib/File/ASN1/Element.php
+++ b/phpseclib/File/ASN1/Element.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ namespace phpseclib3\File\ASN1;
  * An ASN.1 ANY mapping will return an ASN1\Element object. Use of this object
  * will also bypass the normal encoding rules in ASN1::encodeDER()
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Element
 {
@@ -31,7 +27,6 @@ class Element
      * Raw element value
      *
      * @var string
-     * @access private
      */
     public $element;
 
@@ -40,7 +35,6 @@ class Element
      *
      * @param string $encoded
      * @return \phpseclib3\File\ASN1\Element
-     * @access public
      */
     public function __construct($encoded)
     {
diff --git a/phpseclib/File/ASN1/Maps/AccessDescription.php b/phpseclib/File/ASN1/Maps/AccessDescription.php
index f58f91c7..1cbc5a59 100644
--- a/phpseclib/File/ASN1/Maps/AccessDescription.php
+++ b/phpseclib/File/ASN1/Maps/AccessDescription.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AccessDescription
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AccessDescription
 {
diff --git a/phpseclib/File/ASN1/Maps/AdministrationDomainName.php b/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
index 7a9925ec..04183a13 100644
--- a/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
+++ b/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AdministrationDomainName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AdministrationDomainName
 {
diff --git a/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php b/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
index 250019db..0da7eb10 100644
--- a/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AlgorithmIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AlgorithmIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/AnotherName.php b/phpseclib/File/ASN1/Maps/AnotherName.php
index ee6b15c8..d96c170b 100644
--- a/phpseclib/File/ASN1/Maps/AnotherName.php
+++ b/phpseclib/File/ASN1/Maps/AnotherName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AnotherName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AnotherName
 {
diff --git a/phpseclib/File/ASN1/Maps/Attribute.php b/phpseclib/File/ASN1/Maps/Attribute.php
index 2209d831..38a6aeef 100644
--- a/phpseclib/File/ASN1/Maps/Attribute.php
+++ b/phpseclib/File/ASN1/Maps/Attribute.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Attribute
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Attribute
 {
diff --git a/phpseclib/File/ASN1/Maps/AttributeType.php b/phpseclib/File/ASN1/Maps/AttributeType.php
index 891b8082..5cbc2bcc 100644
--- a/phpseclib/File/ASN1/Maps/AttributeType.php
+++ b/phpseclib/File/ASN1/Maps/AttributeType.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AttributeType
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AttributeType
 {
diff --git a/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php b/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
index ba7ea3cf..fe414f16 100644
--- a/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
+++ b/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AttributeTypeAndValue
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AttributeTypeAndValue
 {
diff --git a/phpseclib/File/ASN1/Maps/AttributeValue.php b/phpseclib/File/ASN1/Maps/AttributeValue.php
index eca03273..3b3b6d2e 100644
--- a/phpseclib/File/ASN1/Maps/AttributeValue.php
+++ b/phpseclib/File/ASN1/Maps/AttributeValue.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AttributeValue
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AttributeValue
 {
diff --git a/phpseclib/File/ASN1/Maps/Attributes.php b/phpseclib/File/ASN1/Maps/Attributes.php
index 87ebc36e..cd53ecfa 100644
--- a/phpseclib/File/ASN1/Maps/Attributes.php
+++ b/phpseclib/File/ASN1/Maps/Attributes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Attributes
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Attributes
 {
diff --git a/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php b/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
index 2c975050..3e80a55d 100644
--- a/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
+++ b/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AuthorityInfoAccessSyntax
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AuthorityInfoAccessSyntax
 {
diff --git a/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php b/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
index 65c73214..e7ec5b28 100644
--- a/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * AuthorityKeyIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class AuthorityKeyIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/BaseDistance.php b/phpseclib/File/ASN1/Maps/BaseDistance.php
index 8453e49d..e59668ab 100644
--- a/phpseclib/File/ASN1/Maps/BaseDistance.php
+++ b/phpseclib/File/ASN1/Maps/BaseDistance.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * BaseDistance
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BaseDistance
 {
diff --git a/phpseclib/File/ASN1/Maps/BasicConstraints.php b/phpseclib/File/ASN1/Maps/BasicConstraints.php
index 241a736f..587ef1b0 100644
--- a/phpseclib/File/ASN1/Maps/BasicConstraints.php
+++ b/phpseclib/File/ASN1/Maps/BasicConstraints.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * BasicConstraints
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BasicConstraints
 {
diff --git a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
index 4a5fe533..e81bc78e 100644
--- a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
+++ b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * BuiltInDomainDefinedAttribute
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BuiltInDomainDefinedAttribute
 {
diff --git a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
index ae5b5ef7..471e88f9 100644
--- a/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
+++ b/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * BuiltInDomainDefinedAttributes
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BuiltInDomainDefinedAttributes
 {
diff --git a/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php b/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
index 6f02b86b..752f400d 100644
--- a/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
+++ b/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * BuiltInStandardAttributes
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BuiltInStandardAttributes
 {
diff --git a/phpseclib/File/ASN1/Maps/CPSuri.php b/phpseclib/File/ASN1/Maps/CPSuri.php
index 78733df9..56e58887 100644
--- a/phpseclib/File/ASN1/Maps/CPSuri.php
+++ b/phpseclib/File/ASN1/Maps/CPSuri.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CPSuri
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CPSuri
 {
diff --git a/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php b/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
index d157388b..79860b2f 100644
--- a/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
+++ b/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CRLDistributionPoints
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CRLDistributionPoints
 {
diff --git a/phpseclib/File/ASN1/Maps/CRLNumber.php b/phpseclib/File/ASN1/Maps/CRLNumber.php
index 921fdd52..f6cb9567 100644
--- a/phpseclib/File/ASN1/Maps/CRLNumber.php
+++ b/phpseclib/File/ASN1/Maps/CRLNumber.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CRLNumber
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CRLNumber
 {
diff --git a/phpseclib/File/ASN1/Maps/CRLReason.php b/phpseclib/File/ASN1/Maps/CRLReason.php
index c7e992c7..d3736529 100644
--- a/phpseclib/File/ASN1/Maps/CRLReason.php
+++ b/phpseclib/File/ASN1/Maps/CRLReason.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CRLReason
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CRLReason
 {
diff --git a/phpseclib/File/ASN1/Maps/CertPolicyId.php b/phpseclib/File/ASN1/Maps/CertPolicyId.php
index a4620e7d..d7e7776e 100644
--- a/phpseclib/File/ASN1/Maps/CertPolicyId.php
+++ b/phpseclib/File/ASN1/Maps/CertPolicyId.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertPolicyId
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertPolicyId
 {
diff --git a/phpseclib/File/ASN1/Maps/Certificate.php b/phpseclib/File/ASN1/Maps/Certificate.php
index 06b0cc44..01943a0d 100644
--- a/phpseclib/File/ASN1/Maps/Certificate.php
+++ b/phpseclib/File/ASN1/Maps/Certificate.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Certificate
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Certificate
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificateIssuer.php b/phpseclib/File/ASN1/Maps/CertificateIssuer.php
index ba4504af..9d5e3a62 100644
--- a/phpseclib/File/ASN1/Maps/CertificateIssuer.php
+++ b/phpseclib/File/ASN1/Maps/CertificateIssuer.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificateIssuer
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificateIssuer
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificateList.php b/phpseclib/File/ASN1/Maps/CertificateList.php
index 11330660..d54ed6d9 100644
--- a/phpseclib/File/ASN1/Maps/CertificateList.php
+++ b/phpseclib/File/ASN1/Maps/CertificateList.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificateList
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificateList
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificatePolicies.php b/phpseclib/File/ASN1/Maps/CertificatePolicies.php
index 292f8c6b..ec0fa6b5 100644
--- a/phpseclib/File/ASN1/Maps/CertificatePolicies.php
+++ b/phpseclib/File/ASN1/Maps/CertificatePolicies.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificatePolicies
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificatePolicies
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php b/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
index 83f26d31..06ec944c 100644
--- a/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
+++ b/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificateSerialNumber
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificateSerialNumber
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificationRequest.php b/phpseclib/File/ASN1/Maps/CertificationRequest.php
index 68750b87..2da70ed6 100644
--- a/phpseclib/File/ASN1/Maps/CertificationRequest.php
+++ b/phpseclib/File/ASN1/Maps/CertificationRequest.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificationRequest
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificationRequest
 {
diff --git a/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php b/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
index 752cf65c..ce6dc880 100644
--- a/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
+++ b/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CertificationRequestInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CertificationRequestInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/Characteristic_two.php b/phpseclib/File/ASN1/Maps/Characteristic_two.php
index 2645077b..5bf59bb8 100644
--- a/phpseclib/File/ASN1/Maps/Characteristic_two.php
+++ b/phpseclib/File/ASN1/Maps/Characteristic_two.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Characteristic_two
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Characteristic_two
 {
diff --git a/phpseclib/File/ASN1/Maps/CountryName.php b/phpseclib/File/ASN1/Maps/CountryName.php
index afff9927..737d844d 100644
--- a/phpseclib/File/ASN1/Maps/CountryName.php
+++ b/phpseclib/File/ASN1/Maps/CountryName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * CountryName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class CountryName
 {
diff --git a/phpseclib/File/ASN1/Maps/Curve.php b/phpseclib/File/ASN1/Maps/Curve.php
index 1a574583..621f1035 100644
--- a/phpseclib/File/ASN1/Maps/Curve.php
+++ b/phpseclib/File/ASN1/Maps/Curve.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Curve
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Curve
 {
diff --git a/phpseclib/File/ASN1/Maps/DHParameter.php b/phpseclib/File/ASN1/Maps/DHParameter.php
index 3e929321..26863dbc 100644
--- a/phpseclib/File/ASN1/Maps/DHParameter.php
+++ b/phpseclib/File/ASN1/Maps/DHParameter.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
 /**
  * DHParameter
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DHParameter
 {
diff --git a/phpseclib/File/ASN1/Maps/DSAParams.php b/phpseclib/File/ASN1/Maps/DSAParams.php
index c89fd84b..7af397bb 100644
--- a/phpseclib/File/ASN1/Maps/DSAParams.php
+++ b/phpseclib/File/ASN1/Maps/DSAParams.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DSAParams
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DSAParams
 {
diff --git a/phpseclib/File/ASN1/Maps/DSAPrivateKey.php b/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
index 7e61aecf..d97cd023 100644
--- a/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
+++ b/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DSAPrivateKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DSAPrivateKey
 {
diff --git a/phpseclib/File/ASN1/Maps/DSAPublicKey.php b/phpseclib/File/ASN1/Maps/DSAPublicKey.php
index 867d80b7..f795747a 100644
--- a/phpseclib/File/ASN1/Maps/DSAPublicKey.php
+++ b/phpseclib/File/ASN1/Maps/DSAPublicKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DSAPublicKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DSAPublicKey
 {
diff --git a/phpseclib/File/ASN1/Maps/DigestInfo.php b/phpseclib/File/ASN1/Maps/DigestInfo.php
index 5fe7b9f0..b38ff3c4 100644
--- a/phpseclib/File/ASN1/Maps/DigestInfo.php
+++ b/phpseclib/File/ASN1/Maps/DigestInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DigestInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/DirectoryString.php b/phpseclib/File/ASN1/Maps/DirectoryString.php
index 544fbb3e..45218e3e 100644
--- a/phpseclib/File/ASN1/Maps/DirectoryString.php
+++ b/phpseclib/File/ASN1/Maps/DirectoryString.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DirectoryString
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DirectoryString
 {
diff --git a/phpseclib/File/ASN1/Maps/DisplayText.php b/phpseclib/File/ASN1/Maps/DisplayText.php
index b00ade88..a13e6a64 100644
--- a/phpseclib/File/ASN1/Maps/DisplayText.php
+++ b/phpseclib/File/ASN1/Maps/DisplayText.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DisplayText
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DisplayText
 {
diff --git a/phpseclib/File/ASN1/Maps/DistributionPoint.php b/phpseclib/File/ASN1/Maps/DistributionPoint.php
index f8563a1c..4d9af6b5 100644
--- a/phpseclib/File/ASN1/Maps/DistributionPoint.php
+++ b/phpseclib/File/ASN1/Maps/DistributionPoint.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DistributionPoint
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DistributionPoint
 {
diff --git a/phpseclib/File/ASN1/Maps/DistributionPointName.php b/phpseclib/File/ASN1/Maps/DistributionPointName.php
index 914848ca..bc0cec8f 100644
--- a/phpseclib/File/ASN1/Maps/DistributionPointName.php
+++ b/phpseclib/File/ASN1/Maps/DistributionPointName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DistributionPointName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DistributionPointName
 {
diff --git a/phpseclib/File/ASN1/Maps/DssSigValue.php b/phpseclib/File/ASN1/Maps/DssSigValue.php
index c8743945..2af74088 100644
--- a/phpseclib/File/ASN1/Maps/DssSigValue.php
+++ b/phpseclib/File/ASN1/Maps/DssSigValue.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * DssSigValue
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DssSigValue
 {
diff --git a/phpseclib/File/ASN1/Maps/ECParameters.php b/phpseclib/File/ASN1/Maps/ECParameters.php
index 2404f507..f25f6faa 100644
--- a/phpseclib/File/ASN1/Maps/ECParameters.php
+++ b/phpseclib/File/ASN1/Maps/ECParameters.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -32,9 +30,7 @@ use phpseclib3\File\ASN1;
  *    -- Any future additions to this CHOICE should be coordinated
  *    -- with ANSI X9.
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ECParameters
 {
diff --git a/phpseclib/File/ASN1/Maps/ECPoint.php b/phpseclib/File/ASN1/Maps/ECPoint.php
index 1a9429a4..fb11db83 100644
--- a/phpseclib/File/ASN1/Maps/ECPoint.php
+++ b/phpseclib/File/ASN1/Maps/ECPoint.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ECPoint
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ECPoint
 {
diff --git a/phpseclib/File/ASN1/Maps/ECPrivateKey.php b/phpseclib/File/ASN1/Maps/ECPrivateKey.php
index a0d7a066..7454f387 100644
--- a/phpseclib/File/ASN1/Maps/ECPrivateKey.php
+++ b/phpseclib/File/ASN1/Maps/ECPrivateKey.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
 /**
  * ECPrivateKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ECPrivateKey
 {
diff --git a/phpseclib/File/ASN1/Maps/EDIPartyName.php b/phpseclib/File/ASN1/Maps/EDIPartyName.php
index 4420f30c..ea7dcf19 100644
--- a/phpseclib/File/ASN1/Maps/EDIPartyName.php
+++ b/phpseclib/File/ASN1/Maps/EDIPartyName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * EDIPartyName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EDIPartyName
 {
diff --git a/phpseclib/File/ASN1/Maps/EcdsaSigValue.php b/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
index ea11ffc7..8ab9ff1e 100644
--- a/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
+++ b/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * EcdsaSigValue
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EcdsaSigValue
 {
diff --git a/phpseclib/File/ASN1/Maps/EncryptedData.php b/phpseclib/File/ASN1/Maps/EncryptedData.php
index 7873579f..8d8739e1 100644
--- a/phpseclib/File/ASN1/Maps/EncryptedData.php
+++ b/phpseclib/File/ASN1/Maps/EncryptedData.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * EncryptedData
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EncryptedData
 {
diff --git a/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php b/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
index a6702691..2c935676 100644
--- a/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
+++ b/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * EncryptedPrivateKeyInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EncryptedPrivateKeyInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php b/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
index 3a682d05..f9bc5def 100644
--- a/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
+++ b/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ExtKeyUsageSyntax
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ExtKeyUsageSyntax
 {
diff --git a/phpseclib/File/ASN1/Maps/Extension.php b/phpseclib/File/ASN1/Maps/Extension.php
index 25ce5ee8..e32668fb 100644
--- a/phpseclib/File/ASN1/Maps/Extension.php
+++ b/phpseclib/File/ASN1/Maps/Extension.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -26,9 +24,7 @@ use phpseclib3\File\ASN1;
  *
  * http://tools.ietf.org/html/rfc5280#section-4.2
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Extension
 {
diff --git a/phpseclib/File/ASN1/Maps/ExtensionAttribute.php b/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
index 5af7e292..565b36d3 100644
--- a/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
+++ b/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ExtensionAttribute
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ExtensionAttribute
 {
diff --git a/phpseclib/File/ASN1/Maps/ExtensionAttributes.php b/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
index c0126212..a2e9bfae 100644
--- a/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
+++ b/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ExtensionAttributes
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ExtensionAttributes
 {
diff --git a/phpseclib/File/ASN1/Maps/Extensions.php b/phpseclib/File/ASN1/Maps/Extensions.php
index 37fd5445..5015c976 100644
--- a/phpseclib/File/ASN1/Maps/Extensions.php
+++ b/phpseclib/File/ASN1/Maps/Extensions.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Extensions
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Extensions
 {
diff --git a/phpseclib/File/ASN1/Maps/FieldElement.php b/phpseclib/File/ASN1/Maps/FieldElement.php
index 6666e2ad..31734078 100644
--- a/phpseclib/File/ASN1/Maps/FieldElement.php
+++ b/phpseclib/File/ASN1/Maps/FieldElement.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * FieldElement
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class FieldElement
 {
diff --git a/phpseclib/File/ASN1/Maps/FieldID.php b/phpseclib/File/ASN1/Maps/FieldID.php
index fe3a6716..e32a9c03 100644
--- a/phpseclib/File/ASN1/Maps/FieldID.php
+++ b/phpseclib/File/ASN1/Maps/FieldID.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * FieldID
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class FieldID
 {
diff --git a/phpseclib/File/ASN1/Maps/GeneralName.php b/phpseclib/File/ASN1/Maps/GeneralName.php
index ecf45164..57d86da8 100644
--- a/phpseclib/File/ASN1/Maps/GeneralName.php
+++ b/phpseclib/File/ASN1/Maps/GeneralName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * GeneralName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class GeneralName
 {
diff --git a/phpseclib/File/ASN1/Maps/GeneralNames.php b/phpseclib/File/ASN1/Maps/GeneralNames.php
index 142940d6..5d931532 100644
--- a/phpseclib/File/ASN1/Maps/GeneralNames.php
+++ b/phpseclib/File/ASN1/Maps/GeneralNames.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * GeneralNames
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class GeneralNames
 {
diff --git a/phpseclib/File/ASN1/Maps/GeneralSubtree.php b/phpseclib/File/ASN1/Maps/GeneralSubtree.php
index 1649bd33..5388db55 100644
--- a/phpseclib/File/ASN1/Maps/GeneralSubtree.php
+++ b/phpseclib/File/ASN1/Maps/GeneralSubtree.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * GeneralSubtree
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class GeneralSubtree
 {
diff --git a/phpseclib/File/ASN1/Maps/GeneralSubtrees.php b/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
index a0716cc9..27548cfe 100644
--- a/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
+++ b/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * GeneralSubtrees
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class GeneralSubtrees
 {
diff --git a/phpseclib/File/ASN1/Maps/HashAlgorithm.php b/phpseclib/File/ASN1/Maps/HashAlgorithm.php
index d74ad593..5fd19163 100644
--- a/phpseclib/File/ASN1/Maps/HashAlgorithm.php
+++ b/phpseclib/File/ASN1/Maps/HashAlgorithm.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * HashAglorithm
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class HashAlgorithm
 {
diff --git a/phpseclib/File/ASN1/Maps/HoldInstructionCode.php b/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
index 7d495961..88d6ff3e 100644
--- a/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
+++ b/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * HoldInstructionCode
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class HoldInstructionCode
 {
diff --git a/phpseclib/File/ASN1/Maps/InvalidityDate.php b/phpseclib/File/ASN1/Maps/InvalidityDate.php
index 0ae964ce..f34b5f72 100644
--- a/phpseclib/File/ASN1/Maps/InvalidityDate.php
+++ b/phpseclib/File/ASN1/Maps/InvalidityDate.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * InvalidityDate
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class InvalidityDate
 {
diff --git a/phpseclib/File/ASN1/Maps/IssuerAltName.php b/phpseclib/File/ASN1/Maps/IssuerAltName.php
index 5f71db8f..19b8915f 100644
--- a/phpseclib/File/ASN1/Maps/IssuerAltName.php
+++ b/phpseclib/File/ASN1/Maps/IssuerAltName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * IssuerAltName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class IssuerAltName
 {
diff --git a/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php b/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
index 0feeef40..415996f5 100644
--- a/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
+++ b/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * IssuingDistributionPoint
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class IssuingDistributionPoint
 {
diff --git a/phpseclib/File/ASN1/Maps/KeyIdentifier.php b/phpseclib/File/ASN1/Maps/KeyIdentifier.php
index eb2939b8..82a41519 100644
--- a/phpseclib/File/ASN1/Maps/KeyIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/KeyIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * KeyIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class KeyIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/KeyPurposeId.php b/phpseclib/File/ASN1/Maps/KeyPurposeId.php
index 7aee54ad..b8509f19 100644
--- a/phpseclib/File/ASN1/Maps/KeyPurposeId.php
+++ b/phpseclib/File/ASN1/Maps/KeyPurposeId.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * KeyPurposeId
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class KeyPurposeId
 {
diff --git a/phpseclib/File/ASN1/Maps/KeyUsage.php b/phpseclib/File/ASN1/Maps/KeyUsage.php
index 1cacd745..827ce033 100644
--- a/phpseclib/File/ASN1/Maps/KeyUsage.php
+++ b/phpseclib/File/ASN1/Maps/KeyUsage.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * KeyUsage
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class KeyUsage
 {
diff --git a/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php b/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
index 115f1c53..f0ebcf15 100644
--- a/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
+++ b/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * MaskGenAglorithm
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class MaskGenAlgorithm
 {
diff --git a/phpseclib/File/ASN1/Maps/Name.php b/phpseclib/File/ASN1/Maps/Name.php
index d9a303bf..a6a9009d 100644
--- a/phpseclib/File/ASN1/Maps/Name.php
+++ b/phpseclib/File/ASN1/Maps/Name.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Name
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Name
 {
diff --git a/phpseclib/File/ASN1/Maps/NameConstraints.php b/phpseclib/File/ASN1/Maps/NameConstraints.php
index 0196e9a1..80486f94 100644
--- a/phpseclib/File/ASN1/Maps/NameConstraints.php
+++ b/phpseclib/File/ASN1/Maps/NameConstraints.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * NameConstraints
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class NameConstraints
 {
diff --git a/phpseclib/File/ASN1/Maps/NetworkAddress.php b/phpseclib/File/ASN1/Maps/NetworkAddress.php
index a67c0276..6c68df00 100644
--- a/phpseclib/File/ASN1/Maps/NetworkAddress.php
+++ b/phpseclib/File/ASN1/Maps/NetworkAddress.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * NetworkAddress
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class NetworkAddress
 {
diff --git a/phpseclib/File/ASN1/Maps/NoticeReference.php b/phpseclib/File/ASN1/Maps/NoticeReference.php
index 5bb9b4f5..9eec123a 100644
--- a/phpseclib/File/ASN1/Maps/NoticeReference.php
+++ b/phpseclib/File/ASN1/Maps/NoticeReference.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * NoticeReference
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class NoticeReference
 {
diff --git a/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php b/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
index 04998393..635a89dc 100644
--- a/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * NumericUserIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class NumericUserIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/ORAddress.php b/phpseclib/File/ASN1/Maps/ORAddress.php
index 603cf929..b853abe8 100644
--- a/phpseclib/File/ASN1/Maps/ORAddress.php
+++ b/phpseclib/File/ASN1/Maps/ORAddress.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ORAddress
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ORAddress
 {
diff --git a/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php b/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
index c6d4b1cc..59530248 100644
--- a/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
+++ b/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
 /**
  * OneAsymmetricKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OneAsymmetricKey
 {
diff --git a/phpseclib/File/ASN1/Maps/OrganizationName.php b/phpseclib/File/ASN1/Maps/OrganizationName.php
index 250c9277..b5cc9491 100644
--- a/phpseclib/File/ASN1/Maps/OrganizationName.php
+++ b/phpseclib/File/ASN1/Maps/OrganizationName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * OrganizationName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OrganizationName
 {
diff --git a/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php b/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
index 27d23442..b3e57809 100644
--- a/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
+++ b/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * OrganizationalUnitNames
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OrganizationalUnitNames
 {
diff --git a/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php b/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
index 617a944d..5d565605 100644
--- a/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
+++ b/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * OtherPrimeInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OtherPrimeInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php b/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
index bb833171..9802a808 100644
--- a/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
+++ b/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * OtherPrimeInfos
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OtherPrimeInfos
 {
diff --git a/phpseclib/File/ASN1/Maps/PBEParameter.php b/phpseclib/File/ASN1/Maps/PBEParameter.php
index 9f6a635e..8eb27cf6 100644
--- a/phpseclib/File/ASN1/Maps/PBEParameter.php
+++ b/phpseclib/File/ASN1/Maps/PBEParameter.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PBEParameter
 {
diff --git a/phpseclib/File/ASN1/Maps/PBES2params.php b/phpseclib/File/ASN1/Maps/PBES2params.php
index 5ab966d1..bd31699f 100644
--- a/phpseclib/File/ASN1/Maps/PBES2params.php
+++ b/phpseclib/File/ASN1/Maps/PBES2params.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PBES2params
 {
diff --git a/phpseclib/File/ASN1/Maps/PBKDF2params.php b/phpseclib/File/ASN1/Maps/PBKDF2params.php
index b5e1d220..2dafed9c 100644
--- a/phpseclib/File/ASN1/Maps/PBKDF2params.php
+++ b/phpseclib/File/ASN1/Maps/PBKDF2params.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PBKDF2params
 {
diff --git a/phpseclib/File/ASN1/Maps/PBMAC1params.php b/phpseclib/File/ASN1/Maps/PBMAC1params.php
index a4c7c38c..91319f58 100644
--- a/phpseclib/File/ASN1/Maps/PBMAC1params.php
+++ b/phpseclib/File/ASN1/Maps/PBMAC1params.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PBMAC1params
 {
diff --git a/phpseclib/File/ASN1/Maps/PKCS9String.php b/phpseclib/File/ASN1/Maps/PKCS9String.php
index 0700d23d..87d0862f 100644
--- a/phpseclib/File/ASN1/Maps/PKCS9String.php
+++ b/phpseclib/File/ASN1/Maps/PKCS9String.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PKCS9String
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PKCS9String
 {
diff --git a/phpseclib/File/ASN1/Maps/Pentanomial.php b/phpseclib/File/ASN1/Maps/Pentanomial.php
index f1c14be8..b8c8c02f 100644
--- a/phpseclib/File/ASN1/Maps/Pentanomial.php
+++ b/phpseclib/File/ASN1/Maps/Pentanomial.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Pentanomial
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Pentanomial
 {
diff --git a/phpseclib/File/ASN1/Maps/PersonalName.php b/phpseclib/File/ASN1/Maps/PersonalName.php
index 167751cc..14e2860e 100644
--- a/phpseclib/File/ASN1/Maps/PersonalName.php
+++ b/phpseclib/File/ASN1/Maps/PersonalName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PersonalName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PersonalName
 {
diff --git a/phpseclib/File/ASN1/Maps/PolicyInformation.php b/phpseclib/File/ASN1/Maps/PolicyInformation.php
index d2728e78..1625d199 100644
--- a/phpseclib/File/ASN1/Maps/PolicyInformation.php
+++ b/phpseclib/File/ASN1/Maps/PolicyInformation.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PolicyInformation
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PolicyInformation
 {
diff --git a/phpseclib/File/ASN1/Maps/PolicyMappings.php b/phpseclib/File/ASN1/Maps/PolicyMappings.php
index 11fb8d64..d30b8523 100644
--- a/phpseclib/File/ASN1/Maps/PolicyMappings.php
+++ b/phpseclib/File/ASN1/Maps/PolicyMappings.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PolicyMappings
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PolicyMappings
 {
diff --git a/phpseclib/File/ASN1/Maps/PolicyQualifierId.php b/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
index 454a9d1a..7b7cd6a7 100644
--- a/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
+++ b/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PolicyQualifierId
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PolicyQualifierId
 {
diff --git a/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php b/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
index 77e6f753..d227702e 100644
--- a/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
+++ b/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PolicyQualifierInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PolicyQualifierInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/PostalAddress.php b/phpseclib/File/ASN1/Maps/PostalAddress.php
index 15f615f9..142b309e 100644
--- a/phpseclib/File/ASN1/Maps/PostalAddress.php
+++ b/phpseclib/File/ASN1/Maps/PostalAddress.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PostalAddress
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PostalAddress
 {
diff --git a/phpseclib/File/ASN1/Maps/Prime_p.php b/phpseclib/File/ASN1/Maps/Prime_p.php
index 4a57c463..77430344 100644
--- a/phpseclib/File/ASN1/Maps/Prime_p.php
+++ b/phpseclib/File/ASN1/Maps/Prime_p.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Prime_p
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Prime_p
 {
diff --git a/phpseclib/File/ASN1/Maps/PrivateDomainName.php b/phpseclib/File/ASN1/Maps/PrivateDomainName.php
index fd682f03..195dcaa5 100644
--- a/phpseclib/File/ASN1/Maps/PrivateDomainName.php
+++ b/phpseclib/File/ASN1/Maps/PrivateDomainName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PrivateDomainName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PrivateDomainName
 {
diff --git a/phpseclib/File/ASN1/Maps/PrivateKey.php b/phpseclib/File/ASN1/Maps/PrivateKey.php
index 7670f4ad..3c895941 100644
--- a/phpseclib/File/ASN1/Maps/PrivateKey.php
+++ b/phpseclib/File/ASN1/Maps/PrivateKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PrivateKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PrivateKey
 {
diff --git a/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php b/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
index e836abfa..b440b78d 100644
--- a/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
+++ b/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PrivateKeyInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PrivateKeyInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php b/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
index 9878546c..5b87036e 100644
--- a/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
+++ b/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PrivateKeyUsagePeriod
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PrivateKeyUsagePeriod
 {
diff --git a/phpseclib/File/ASN1/Maps/PublicKey.php b/phpseclib/File/ASN1/Maps/PublicKey.php
index b8239aa6..48409204 100644
--- a/phpseclib/File/ASN1/Maps/PublicKey.php
+++ b/phpseclib/File/ASN1/Maps/PublicKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PublicKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PublicKey
 {
diff --git a/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php b/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
index 83fd386e..432581e4 100644
--- a/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
+++ b/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * PublicKeyAndChallenge
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PublicKeyAndChallenge
 {
diff --git a/phpseclib/File/ASN1/Maps/PublicKeyInfo.php b/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
index bfa9c2e4..b39a341f 100644
--- a/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
+++ b/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ use phpseclib3\File\ASN1;
  * this format is not formally defined anywhere but is none-the-less the form you
  * get when you do "openssl rsa -in private.pem -outform PEM -pubout"
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PublicKeyInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/RC2CBCParameter.php b/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
index f32ea970..48649abd 100644
--- a/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
+++ b/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * from https://tools.ietf.org/html/rfc2898#appendix-A.3
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RC2CBCParameter
 {
diff --git a/phpseclib/File/ASN1/Maps/RDNSequence.php b/phpseclib/File/ASN1/Maps/RDNSequence.php
index f2f1dcf0..04b071c2 100644
--- a/phpseclib/File/ASN1/Maps/RDNSequence.php
+++ b/phpseclib/File/ASN1/Maps/RDNSequence.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -26,9 +24,7 @@ use phpseclib3\File\ASN1;
  *
  * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RDNSequence
 {
diff --git a/phpseclib/File/ASN1/Maps/RSAPrivateKey.php b/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
index 1fdd231b..8c19c658 100644
--- a/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
+++ b/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * RSAPrivateKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RSAPrivateKey
 {
diff --git a/phpseclib/File/ASN1/Maps/RSAPublicKey.php b/phpseclib/File/ASN1/Maps/RSAPublicKey.php
index 14cd8687..b14c32c4 100644
--- a/phpseclib/File/ASN1/Maps/RSAPublicKey.php
+++ b/phpseclib/File/ASN1/Maps/RSAPublicKey.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * RSAPublicKey
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RSAPublicKey
 {
diff --git a/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php b/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
index 1a4b3809..1a784bf4 100644
--- a/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
+++ b/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
 /**
  * RSASSA_PSS_params
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RSASSA_PSS_params
 {
diff --git a/phpseclib/File/ASN1/Maps/ReasonFlags.php b/phpseclib/File/ASN1/Maps/ReasonFlags.php
index a834156d..2e62fcdb 100644
--- a/phpseclib/File/ASN1/Maps/ReasonFlags.php
+++ b/phpseclib/File/ASN1/Maps/ReasonFlags.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * ReasonFlags
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class ReasonFlags
 {
diff --git a/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php b/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
index 9a9af402..a0421f73 100644
--- a/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
+++ b/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -26,9 +24,7 @@ use phpseclib3\File\ASN1;
  *
  * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RelativeDistinguishedName
 {
diff --git a/phpseclib/File/ASN1/Maps/RevokedCertificate.php b/phpseclib/File/ASN1/Maps/RevokedCertificate.php
index 21da71eb..ff759eb7 100644
--- a/phpseclib/File/ASN1/Maps/RevokedCertificate.php
+++ b/phpseclib/File/ASN1/Maps/RevokedCertificate.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * RevokedCertificate
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class RevokedCertificate
 {
diff --git a/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php b/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
index d723d572..0f482a26 100644
--- a/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
+++ b/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * SignedPublicKeyAndChallenge
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SignedPublicKeyAndChallenge
 {
diff --git a/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php b/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
index 28bfed54..7408a563 100644
--- a/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
+++ b/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
 /**
  * SpecifiedECDomain
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SpecifiedECDomain
 {
diff --git a/phpseclib/File/ASN1/Maps/SubjectAltName.php b/phpseclib/File/ASN1/Maps/SubjectAltName.php
index 02d2d6d4..387f190c 100644
--- a/phpseclib/File/ASN1/Maps/SubjectAltName.php
+++ b/phpseclib/File/ASN1/Maps/SubjectAltName.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * SubjectAltName
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SubjectAltName
 {
diff --git a/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php b/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
index 8e850267..f2e206f6 100644
--- a/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
+++ b/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * SubjectDirectoryAttributes
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SubjectDirectoryAttributes
 {
diff --git a/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php b/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
index 910f8215..1ff241f7 100644
--- a/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
+++ b/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * SubjectInfoAccessSyntax
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SubjectInfoAccessSyntax
 {
diff --git a/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php b/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
index 1b366320..0d53d540 100644
--- a/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
+++ b/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * SubjectPublicKeyInfo
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class SubjectPublicKeyInfo
 {
diff --git a/phpseclib/File/ASN1/Maps/TBSCertList.php b/phpseclib/File/ASN1/Maps/TBSCertList.php
index 93d81484..49b3cfc5 100644
--- a/phpseclib/File/ASN1/Maps/TBSCertList.php
+++ b/phpseclib/File/ASN1/Maps/TBSCertList.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * TBSCertList
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class TBSCertList
 {
diff --git a/phpseclib/File/ASN1/Maps/TBSCertificate.php b/phpseclib/File/ASN1/Maps/TBSCertificate.php
index b3ca20bf..007360c9 100644
--- a/phpseclib/File/ASN1/Maps/TBSCertificate.php
+++ b/phpseclib/File/ASN1/Maps/TBSCertificate.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * TBSCertificate
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class TBSCertificate
 {
diff --git a/phpseclib/File/ASN1/Maps/TerminalIdentifier.php b/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
index 5c6fdddb..7f6d9d2e 100644
--- a/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * TerminalIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class TerminalIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/Time.php b/phpseclib/File/ASN1/Maps/Time.php
index 3bc309f5..744ee704 100644
--- a/phpseclib/File/ASN1/Maps/Time.php
+++ b/phpseclib/File/ASN1/Maps/Time.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Time
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Time
 {
diff --git a/phpseclib/File/ASN1/Maps/Trinomial.php b/phpseclib/File/ASN1/Maps/Trinomial.php
index 55e7be81..33baa91e 100644
--- a/phpseclib/File/ASN1/Maps/Trinomial.php
+++ b/phpseclib/File/ASN1/Maps/Trinomial.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Trinomial
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Trinomial
 {
diff --git a/phpseclib/File/ASN1/Maps/UniqueIdentifier.php b/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
index 64645773..f4c954bb 100644
--- a/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
+++ b/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * UniqueIdentifier
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class UniqueIdentifier
 {
diff --git a/phpseclib/File/ASN1/Maps/UserNotice.php b/phpseclib/File/ASN1/Maps/UserNotice.php
index 9addbce2..98d527b7 100644
--- a/phpseclib/File/ASN1/Maps/UserNotice.php
+++ b/phpseclib/File/ASN1/Maps/UserNotice.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * UserNotice
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class UserNotice
 {
diff --git a/phpseclib/File/ASN1/Maps/Validity.php b/phpseclib/File/ASN1/Maps/Validity.php
index aa609e25..8ef64cf5 100644
--- a/phpseclib/File/ASN1/Maps/Validity.php
+++ b/phpseclib/File/ASN1/Maps/Validity.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * Validity
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Validity
 {
diff --git a/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php b/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
index 1da389a7..2ab15728 100644
--- a/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
+++ b/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * netscape_ca_policy_url
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class netscape_ca_policy_url
 {
diff --git a/phpseclib/File/ASN1/Maps/netscape_cert_type.php b/phpseclib/File/ASN1/Maps/netscape_cert_type.php
index 1fd490b1..49e8da4b 100644
--- a/phpseclib/File/ASN1/Maps/netscape_cert_type.php
+++ b/phpseclib/File/ASN1/Maps/netscape_cert_type.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\File\ASN1;
  *
  * mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class netscape_cert_type
 {
diff --git a/phpseclib/File/ASN1/Maps/netscape_comment.php b/phpseclib/File/ASN1/Maps/netscape_comment.php
index 8ff14dac..d3ff4ddf 100644
--- a/phpseclib/File/ASN1/Maps/netscape_comment.php
+++ b/phpseclib/File/ASN1/Maps/netscape_comment.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  File
- * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2016 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\File\ASN1;
 /**
  * netscape_comment
  *
- * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class netscape_comment
 {
diff --git a/phpseclib/File/X509.php b/phpseclib/File/X509.php
index 1251cca0..379863b4 100644
--- a/phpseclib/File/X509.php
+++ b/phpseclib/File/X509.php
@@ -16,8 +16,6 @@
  * be encoded.  It can be encoded explicitly or left out all together.  This would effect the signature value and thus may invalidate the
  * the certificate all together unless the certificate is re-signed.
  *
- * @category  File
- * @package   X509
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -45,9 +43,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Pure-PHP X.509 Parser
  *
- * @package X509
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class X509
 {
@@ -56,49 +52,42 @@ class X509
      *
      * Not really used anymore but retained all the same to suppress E_NOTICEs from old installs
      *
-     * @access public
      */
     const VALIDATE_SIGNATURE_BY_CA = 1;
 
     /**
      * Return internal array representation
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_ARRAY = 0;
     /**
      * Return string
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_STRING = 1;
     /**
      * Return ASN.1 name string
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_ASN1 = 2;
     /**
      * Return OpenSSL compatible array
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_OPENSSL = 3;
     /**
      * Return canonical ASN.1 RDNs string
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_CANON = 4;
     /**
      * Return name hash for file indexing
      *
-     * @access public
      * @see \phpseclib3\File\X509::getDN()
      */
     const DN_HASH = 5;
@@ -108,7 +97,6 @@ class X509
      *
      * ie. a base64-encoded PEM with a header and a footer
      *
-     * @access public
      * @see \phpseclib3\File\X509::saveX509()
      * @see \phpseclib3\File\X509::saveCSR()
      * @see \phpseclib3\File\X509::saveCRL()
@@ -117,7 +105,6 @@ class X509
     /**
      * Save as DER
      *
-     * @access public
      * @see \phpseclib3\File\X509::saveX509()
      * @see \phpseclib3\File\X509::saveCSR()
      * @see \phpseclib3\File\X509::saveCRL()
@@ -126,7 +113,6 @@ class X509
     /**
      * Save as a SPKAC
      *
-     * @access public
      * @see \phpseclib3\File\X509::saveX509()
      * @see \phpseclib3\File\X509::saveCSR()
      * @see \phpseclib3\File\X509::saveCRL()
@@ -139,7 +125,6 @@ class X509
      *
      * Used only by the load*() functions
      *
-     * @access public
      * @see \phpseclib3\File\X509::saveX509()
      * @see \phpseclib3\File\X509::saveCSR()
      * @see \phpseclib3\File\X509::saveCRL()
@@ -158,7 +143,6 @@ class X509
      * Distinguished Name
      *
      * @var array
-     * @access private
      */
     private $dn;
 
@@ -166,7 +150,6 @@ class X509
      * Public key
      *
      * @var string|PublicKey
-     * @access private
      */
     private $publicKey;
 
@@ -174,7 +157,6 @@ class X509
      * Private key
      *
      * @var string|PrivateKey
-     * @access private
      */
     private $privateKey;
 
@@ -182,7 +164,6 @@ class X509
      * Object identifiers for X.509 certificates
      *
      * @var array
-     * @access private
      * @link http://en.wikipedia.org/wiki/Object_identifier
      */
     private $oids;
@@ -191,7 +172,6 @@ class X509
      * The certificate authorities
      *
      * @var array
-     * @access private
      */
     private $CAs;
 
@@ -199,7 +179,6 @@ class X509
      * The currently loaded certificate
      *
      * @var array
-     * @access private
      */
     private $currentCert;
 
@@ -210,7 +189,6 @@ class X509
      * encoded so we take save the portion of the original cert that the signature would have made for.
      *
      * @var string
-     * @access private
      */
     private $signatureSubject;
 
@@ -218,7 +196,6 @@ class X509
      * Certificate Start Date
      *
      * @var string
-     * @access private
      */
     private $startDate;
 
@@ -226,7 +203,6 @@ class X509
      * Certificate End Date
      *
      * @var string|Element
-     * @access private
      */
     private $endDate;
 
@@ -234,7 +210,6 @@ class X509
      * Serial Number
      *
      * @var string
-     * @access private
      */
     private $serialNumber;
 
@@ -245,7 +220,6 @@ class X509
      * {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.2 RFC5280#section-4.2.1.2}.
      *
      * @var string
-     * @access private
      */
     private $currentKeyIdentifier;
 
@@ -253,7 +227,6 @@ class X509
      * CA Flag
      *
      * @var bool
-     * @access private
      */
     private $caFlag = false;
 
@@ -261,13 +234,11 @@ class X509
      * SPKAC Challenge
      *
      * @var string
-     * @access private
      */
     private $challenge;
 
     /**
      * @var array
-     * @access private
      */
     private $extensionValues = [];
 
@@ -275,7 +246,6 @@ class X509
      * OIDs loaded
      *
      * @var bool
-     * @access private
      */
     private static $oidsLoaded = false;
 
@@ -283,7 +253,6 @@ class X509
      * Recursion Limit
      *
      * @var int
-     * @access private
      */
     private static $recur_limit = 5;
 
@@ -291,25 +260,21 @@ class X509
      * URL fetch flag
      *
      * @var bool
-     * @access private
      */
     private static $disable_url_fetch = false;
 
     /**
      * @var array
-     * @access private
      */
     private static $extensions = [];
 
     /**
      * @var ?array
-     * @access private
      */
     private $ipAddresses = null;
 
     /**
      * @var ?array
-     * @access private
      */
     private $domains = null;
 
@@ -317,7 +282,6 @@ class X509
      * Default Constructor.
      *
      * @return \phpseclib3\File\X509
-     * @access public
      */
     public function __construct()
     {
@@ -468,7 +432,6 @@ class X509
      *
      * @param string $cert
      * @param int $mode
-     * @access public
      * @return mixed
      */
     public function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
@@ -542,7 +505,6 @@ class X509
      *
      * @param array $cert
      * @param int $format optional
-     * @access public
      * @return string
      */
     public function saveX509($cert, $format = self::FORMAT_PEM)
@@ -614,7 +576,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapInExtensions(&$root, $path)
     {
@@ -663,7 +624,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapOutExtensions(&$root, $path)
     {
@@ -745,7 +705,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapInAttributes(&$root, $path)
     {
@@ -785,7 +744,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapOutAttributes(&$root, $path)
     {
@@ -827,7 +785,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapInDNs(&$root, $path)
     {
@@ -856,7 +813,6 @@ class X509
      *
      * @param array $root (by reference)
      * @param string $path
-     * @access private
      */
     private function mapOutDNs(&$root, $path)
     {
@@ -885,7 +841,6 @@ class X509
      * Associate an extension ID to an extension mapping
      *
      * @param string $extnId
-     * @access private
      * @return mixed
      */
     private function getMapping($extnId)
@@ -995,7 +950,6 @@ class X509
      * Load an X.509 certificate as a certificate authority
      *
      * @param string $cert
-     * @access public
      * @return bool
      */
     public function loadCA($cert)
@@ -1062,7 +1016,6 @@ class X509
      * not bar.foo.a.com. f*.com matches foo.com but not bar.com.
      *
      * @param string $url
-     * @access public
      * @return bool
      */
     public function validateURL($url)
@@ -1122,7 +1075,6 @@ class X509
      * If $date isn't defined it is assumed to be the current date.
      *
      * @param \DateTimeInterface|string $date optional
-     * @access public
      * @return bool
      */
     public function validateDate($date = null)
@@ -1155,7 +1107,6 @@ class X509
      * Fetches a URL
      *
      * @param string $url
-     * @access private
      * @return bool|string
      */
     private static function fetchURL($url)
@@ -1211,7 +1162,6 @@ class X509
      *
      * @param bool $caonly
      * @param int $count
-     * @access private
      * @return bool
      */
     private function testForIntermediate($caonly, $count)
@@ -1278,7 +1228,6 @@ class X509
      * The behavior of this function is inspired by {@link http://php.net/openssl-verify openssl_verify}.
      *
      * @param bool $caonly optional
-     * @access public
      * @return mixed
      */
     public function validateSignature($caonly = true)
@@ -1293,7 +1242,6 @@ class X509
      *
      * @param bool $caonly
      * @param int $count
-     * @access private
      * @return mixed
      */
     private function validateSignatureCountable($caonly, $count)
@@ -1427,7 +1375,6 @@ class X509
      * @param string $signatureAlgorithm
      * @param string $signature
      * @param string $signatureSubject
-     * @access private
      * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
      * @return bool
      */
@@ -1502,7 +1449,6 @@ class X509
      * that we set a recursion limit. A negative number means that there is no recursion limit.
      *
      * @param int $count
-     * @access public
      */
     public static function setRecurLimit($count)
     {
@@ -1512,7 +1458,6 @@ class X509
     /**
      * Prevents URIs from being automatically retrieved
      *
-     * @access public
      */
     public static function disableURLFetch()
     {
@@ -1522,7 +1467,6 @@ class X509
     /**
      * Allows URIs to be automatically retrieved
      *
-     * @access public
      */
     public static function enableURLFetch()
     {
@@ -1535,7 +1479,6 @@ class X509
      * Takes in a base64 encoded "blob" and returns a human readable IP address
      *
      * @param string $ip
-     * @access private
      * @return string
      */
     public static function decodeIP($ip)
@@ -1549,7 +1492,6 @@ class X509
      * Takes in a base64 encoded "blob" and returns a human readable IP address / mask
      *
      * @param string $ip
-     * @access private
      * @return array
      */
     public static function decodeNameConstraintIP($ip)
@@ -1566,7 +1508,6 @@ class X509
      * Takes a human readable IP address into a base64-encoded "blob"
      *
      * @param string|array $ip
-     * @access private
      * @return string
      */
     public static function encodeIP($ip)
@@ -1580,7 +1521,6 @@ class X509
      * "Normalizes" a Distinguished Name property
      *
      * @param string $propName
-     * @access private
      * @return mixed
      */
     private function translateDNProp($propName)
@@ -1674,7 +1614,6 @@ class X509
      * @param string $propName
      * @param mixed $propValue
      * @param string $type optional
-     * @access public
      * @return bool
      */
     public function setDNProp($propName, $propValue, $type = 'utf8String')
@@ -1706,7 +1645,6 @@ class X509
      * Remove Distinguished Name properties
      *
      * @param string $propName
-     * @access public
      */
     public function removeDNProp($propName)
     {
@@ -1740,7 +1678,6 @@ class X509
      * @param array $dn optional
      * @param bool $withType optional
      * @return mixed
-     * @access public
      */
     public function getDNProp($propName, $dn = null, $withType = false)
     {
@@ -1801,7 +1738,6 @@ class X509
      * @param mixed $dn
      * @param bool $merge optional
      * @param string $type optional
-     * @access public
      * @return bool
      */
     public function setDN($dn, $merge = false, $type = 'utf8String')
@@ -1843,7 +1779,6 @@ class X509
      *
      * @param mixed $format optional
      * @param array $dn optional
-     * @access public
      * @return array|bool|string
      */
     public function getDN($format = self::DN_ARRAY, $dn = null)
@@ -1985,7 +1920,6 @@ class X509
      * Get the Distinguished Name for a certificate/crl issuer
      *
      * @param int $format optional
-     * @access public
      * @return mixed
      */
     public function getIssuerDN($format = self::DN_ARRAY)
@@ -2007,7 +1941,6 @@ class X509
      * Alias of getDN()
      *
      * @param int $format optional
-     * @access public
      * @return mixed
      */
     public function getSubjectDN($format = self::DN_ARRAY)
@@ -2031,7 +1964,6 @@ class X509
      *
      * @param string $propName
      * @param bool $withType optional
-     * @access public
      * @return mixed
      */
     public function getIssuerDNProp($propName, $withType = false)
@@ -2053,7 +1985,6 @@ class X509
      *
      * @param string $propName
      * @param bool $withType optional
-     * @access public
      * @return mixed
      */
     public function getSubjectDNProp($propName, $withType = false)
@@ -2075,7 +2006,6 @@ class X509
     /**
      * Get the certificate chain for the current cert
      *
-     * @access public
      * @return mixed
      */
     public function getChain()
@@ -2120,7 +2050,6 @@ class X509
     /**
      * Returns the current cert
      *
-     * @access public
      * @return array|bool
      */
     public function &getCurrentCert()
@@ -2134,7 +2063,6 @@ class X509
      * Key needs to be a \phpseclib3\Crypt\RSA object
      *
      * @param PublicKey $key
-     * @access public
      * @return void
      */
     public function setPublicKey(PublicKey $key)
@@ -2148,7 +2076,6 @@ class X509
      * Key needs to be a \phpseclib3\Crypt\RSA object
      *
      * @param PrivateKey $key
-     * @access public
      */
     public function setPrivateKey(PrivateKey $key)
     {
@@ -2161,7 +2088,6 @@ class X509
      * Used for SPKAC CSR's
      *
      * @param string $challenge
-     * @access public
      */
     public function setChallenge($challenge)
     {
@@ -2173,7 +2099,6 @@ class X509
      *
      * Returns a \phpseclib3\Crypt\RSA object or a false.
      *
-     * @access public
      * @return mixed
      */
     public function getPublicKey()
@@ -2223,7 +2148,6 @@ class X509
      * @param string $csr
      * @param int $mode
      * @return mixed
-     * @access public
      */
     public function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
     {
@@ -2297,7 +2221,6 @@ class X509
      *
      * @param array $csr
      * @param int $format optional
-     * @access public
      * @return string
      */
     public function saveCSR($csr, $format = self::FORMAT_PEM)
@@ -2343,7 +2266,6 @@ class X509
      * https://developer.mozilla.org/en-US/docs/HTML/Element/keygen
      *
      * @param string $spkac
-     * @access public
      * @return mixed
      */
     public function loadSPKAC($spkac)
@@ -2408,7 +2330,6 @@ class X509
      *
      * @param array $spkac
      * @param int $format optional
-     * @access public
      * @return string
      */
     public function saveSPKAC($spkac, $format = self::FORMAT_PEM)
@@ -2447,7 +2368,6 @@ class X509
      * @param string $crl
      * @param int $mode
      * @return mixed
-     * @access public
      */
     public function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
     {
@@ -2513,7 +2433,6 @@ class X509
      *
      * @param array $crl
      * @param int $format optional
-     * @access public
      * @return string
      */
     public function saveCRL($crl, $format = self::FORMAT_PEM)
@@ -2571,7 +2490,6 @@ class X509
      * by choosing utcTime iff year of date given is before 2050 and generalTime else.
      *
      * @param string $date in format date('D, d M Y H:i:s O')
-     * @access private
      * @return array|Element
      */
     private function timeField($date)
@@ -2597,7 +2515,6 @@ class X509
      *
      * @param \phpseclib3\File\X509 $issuer
      * @param \phpseclib3\File\X509 $subject
-     * @access public
      * @return mixed
      */
     public function sign($issuer, $subject)
@@ -2790,7 +2707,6 @@ class X509
     /**
      * Sign a CSR
      *
-     * @access public
      * @return mixed
      */
     public function signCSR()
@@ -2845,7 +2761,6 @@ class X509
     /**
      * Sign a SPKAC
      *
-     * @access public
      * @return mixed
      */
     public function signSPKAC()
@@ -2910,7 +2825,6 @@ class X509
      *
      * @param \phpseclib3\File\X509 $issuer
      * @param \phpseclib3\File\X509 $crl
-     * @access public
      * @return mixed
      */
     public function signCRL($issuer, $crl)
@@ -3041,7 +2955,6 @@ class X509
      * Identify signature algorithm from key settings
      *
      * @param PrivateKey $key
-     * @access private
      * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
      * @return string
      */
@@ -3098,7 +3011,6 @@ class X509
      * Set certificate start date
      *
      * @param \DateTimeInterface|string $date
-     * @access public
      */
     public function setStartDate($date)
     {
@@ -3113,7 +3025,6 @@ class X509
      * Set certificate end date
      *
      * @param \DateTimeInterface|string $date
-     * @access public
      */
     public function setEndDate($date)
     {
@@ -3142,7 +3053,6 @@ class X509
      *
      * @param string $serial
      * @param int $base optional
-     * @access public
      */
     public function setSerialNumber($serial, $base = -256)
     {
@@ -3152,7 +3062,6 @@ class X509
     /**
      * Turns the certificate into a certificate authority
      *
-     * @access public
      */
     public function makeCA()
     {
@@ -3169,7 +3078,6 @@ class X509
      * @param array $root
      * @param string $path
      * @return boolean
-     * @access private
      */
     private function isSubArrayValid($root, $path)
     {
@@ -3205,7 +3113,6 @@ class X509
      * @param array $root
      * @param string $path  absolute path with / as component separator
      * @param bool $create optional
-     * @access private
      * @return array|false
      */
     private function &subArrayUnchecked(&$root, $path, $create = false)
@@ -3233,7 +3140,6 @@ class X509
      * @param array $root
      * @param string $path  absolute path with / as component separator
      * @param bool $create optional
-     * @access private
      * @return array|false
      */
     private function &subArray(&$root, $path, $create = false)
@@ -3269,7 +3175,6 @@ class X509
      * @param array $root
      * @param string $path optional absolute path with / as component separator
      * @param bool $create optional
-     * @access private
      * @return array|false
      */
     private function &extensions(&$root, $path = null, $create = false)
@@ -3323,7 +3228,6 @@ class X509
      *
      * @param string $id
      * @param string $path optional
-     * @access private
      * @return bool
      */
     private function removeExtensionHelper($id, $path = null)
@@ -3358,7 +3262,6 @@ class X509
      * @param string $id
      * @param array $cert optional
      * @param string $path optional
-     * @access private
      * @return mixed
      */
     private function getExtensionHelper($id, $cert = null, $path = null)
@@ -3383,7 +3286,6 @@ class X509
      *
      * @param array $cert optional
      * @param string $path optional
-     * @access private
      * @return array
      */
     private function getExtensionsHelper($cert = null, $path = null)
@@ -3408,7 +3310,6 @@ class X509
      * @param bool $critical optional
      * @param bool $replace optional
      * @param string $path optional
-     * @access private
      * @return bool
      */
     private function setExtensionHelper($id, $value, $critical = false, $replace = true, $path = null)
@@ -3440,7 +3341,6 @@ class X509
      * Remove a certificate, CSR or CRL Extension
      *
      * @param string $id
-     * @access public
      * @return bool
      */
     public function removeExtension($id)
@@ -3456,7 +3356,6 @@ class X509
      * @param string $id
      * @param array $cert optional
      * @param string $path
-     * @access public
      * @return mixed
      */
     public function getExtension($id, $cert = null, $path = null)
@@ -3469,7 +3368,6 @@ class X509
      *
      * @param array $cert optional
      * @param string $path optional
-     * @access public
      * @return array
      */
     public function getExtensions($cert = null, $path = null)
@@ -3484,7 +3382,6 @@ class X509
      * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
-     * @access public
      * @return bool
      */
     public function setExtension($id, $value, $critical = false, $replace = true)
@@ -3497,7 +3394,6 @@ class X509
      *
      * @param string $id
      * @param int $disposition optional
-     * @access public
      * @return bool
      */
     public function removeAttribute($id, $disposition = self::ATTR_ALL)
@@ -3548,7 +3444,6 @@ class X509
      * @param string $id
      * @param int $disposition optional
      * @param array $csr optional
-     * @access public
      * @return mixed
      */
     public function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
@@ -3588,7 +3483,6 @@ class X509
      * Returns a list of all CSR attributes in use
      *
      * @param array $csr optional
-     * @access public
      * @return array
      */
     public function getAttributes($csr = null)
@@ -3615,7 +3509,6 @@ class X509
      * @param string $id
      * @param mixed $value
      * @param int $disposition optional
-     * @access public
      * @return bool
      */
     public function setAttribute($id, $value, $disposition = self::ATTR_ALL)
@@ -3672,7 +3565,6 @@ class X509
      * This is used by the id-ce-authorityKeyIdentifier and the id-ce-subjectKeyIdentifier extensions.
      *
      * @param string $value
-     * @access public
      */
     public function setKeyIdentifier($value)
     {
@@ -3698,7 +3590,6 @@ class X509
      *
      * @param mixed $key optional
      * @param int $method optional
-     * @access public
      * @return string binary key identifier
      */
     public function computeKeyIdentifier($key = null, $method = 1)
@@ -3767,7 +3658,6 @@ class X509
     /**
      * Format a public key as appropriate
      *
-     * @access private
      * @return array|false
      */
     private function formatSubjectPublicKey()
@@ -3793,7 +3683,6 @@ class X509
      * Set the domain name's which the cert is to be valid for
      *
      * @param mixed ...$domains
-     * @access public
      * @return void
      */
     public function setDomain(...$domains)
@@ -3806,7 +3695,6 @@ class X509
     /**
      * Set the IP Addresses's which the cert is to be valid for
      *
-     * @access public
      * @param mixed[] ...$ipAddresses
      */
     public function setIPAddress(...$ipAddresses)
@@ -3823,7 +3711,6 @@ class X509
     /**
      * Helper function to build domain array
      *
-     * @access private
      * @param string $domain
      * @return array
      */
@@ -3837,7 +3724,6 @@ class X509
      *
      * (IPv6 is not currently supported)
      *
-     * @access private
      * @param string $address
      * @return array
      */
@@ -3852,7 +3738,6 @@ class X509
      * @param array $rclist
      * @param string $serial
      * @param bool $create optional
-     * @access private
      * @return int|false
      */
     private function revokedCertificate(&$rclist, $serial, $create = false)
@@ -3881,7 +3766,6 @@ class X509
      *
      * @param string $serial
      * @param string $date optional
-     * @access public
      * @return bool
      */
     public function revoke($serial, $date = null)
@@ -3907,7 +3791,6 @@ class X509
      * Unrevoke a certificate.
      *
      * @param string $serial
-     * @access public
      * @return bool
      */
     public function unrevoke($serial)
@@ -3927,7 +3810,6 @@ class X509
      * Get a revoked certificate.
      *
      * @param string $serial
-     * @access public
      * @return mixed
      */
     public function getRevoked($serial)
@@ -3945,7 +3827,6 @@ class X509
      * List revoked certificates
      *
      * @param array $crl optional
-     * @access public
      * @return array|bool
      */
     public function listRevoked($crl = null)
@@ -3974,7 +3855,6 @@ class X509
      *
      * @param string $serial
      * @param string $id
-     * @access public
      * @return bool
      */
     public function removeRevokedCertificateExtension($serial, $id)
@@ -3996,7 +3876,6 @@ class X509
      * @param string $serial
      * @param string $id
      * @param array $crl optional
-     * @access public
      * @return mixed
      */
     public function getRevokedCertificateExtension($serial, $id, $crl = null)
@@ -4019,7 +3898,6 @@ class X509
      *
      * @param string $serial
      * @param array $crl optional
-     * @access public
      * @return array|bool
      */
     public function getRevokedCertificateExtensions($serial, $crl = null)
@@ -4045,7 +3923,6 @@ class X509
      * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
-     * @access public
      * @return bool
      */
     public function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
diff --git a/phpseclib/Math/BigInteger.php b/phpseclib/Math/BigInteger.php
index c7b997cb..b3ab84a8 100644
--- a/phpseclib/Math/BigInteger.php
+++ b/phpseclib/Math/BigInteger.php
@@ -20,8 +20,6 @@
  * ?>
  * </code>
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -36,9 +34,7 @@ use phpseclib3\Math\BigInteger\Engines\Engine;
  * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
  * numbers.
  *
- * @package BigInteger
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class BigInteger implements \JsonSerializable
 {
@@ -366,7 +362,6 @@ class BigInteger implements \JsonSerializable
      * Absolute value.
      *
      * @return BigInteger
-     * @access public
      */
     public function abs()
     {
@@ -493,7 +488,6 @@ class BigInteger implements \JsonSerializable
      *
      * @param BigInteger $y
      * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
      * @see self::equals()
      */
     public function compare(BigInteger $y)
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath.php b/phpseclib/Math/BigInteger/Engines/BCMath.php
index db30a87f..3f0355f4 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Exception\BadConfigurationException;
 /**
  * BCMath Engine.
  *
- * @package BCMath
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class BCMath extends Engine
 {
@@ -32,7 +28,6 @@ class BCMath extends Engine
      *
      * @see parent::bitwise_leftRotate()
      * @see parent::bitwise_rightRotate()
-     * @access protected
      */
     const FAST_BITWISE = false;
 
@@ -40,7 +35,6 @@ class BCMath extends Engine
      * Engine Directory
      *
      * @see parent::setModExpEngine
-     * @access protected
      */
     const ENGINE_DIR = 'BCMath';
 
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Base.php b/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
index d0f2ab22..fe21e041 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\BCMath;
 /**
  * Sliding Window Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Base extends BCMath
 {
@@ -31,13 +27,11 @@ abstract class Base extends BCMath
      *
      * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
      *
-     * @access private
      */
     const VARIABLE = 0;
     /**
      * $cache[self::DATA] contains the cached data.
      *
-     * @access private
      */
     const DATA = 1;
 
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php b/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
index cda5e934..b7ca8a2c 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\BCMath;
 /**
  * Built-In BCMath Modular Exponentiation Engine
  *
- * @package BCMath
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class BuiltIn extends BCMath
 {
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
index 0872da76..b2d9fa95 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\BCMath\Reductions\Barrett;
 /**
  * PHP Default Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DefaultEngine extends Barrett
 {
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
index 093a605d..aed94942 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
 /**
  * OpenSSL Modular Exponentiation Engine
  *
- * @package BCMath
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSL extends Progenitor
 {
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
index 1ec206c4..0fb7eaeb 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
 /**
  * PHP Barrett Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Barrett extends Base
 {
@@ -31,13 +27,11 @@ abstract class Barrett extends Base
      *
      * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
      *
-     * @access private
      */
     const VARIABLE = 0;
     /**
      * $cache[self::DATA] contains the cached data.
      *
-     * @access private
      */
     const DATA = 1;
 
diff --git a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
index 09d4fa79..e033ba57 100644
--- a/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
+++ b/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
 /**
  * PHP Barrett Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EvalBarrett extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/Engine.php b/phpseclib/Math/BigInteger/Engines/Engine.php
index a332c5c1..cf907969 100644
--- a/phpseclib/Math/BigInteger/Engines/Engine.php
+++ b/phpseclib/Math/BigInteger/Engines/Engine.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -24,9 +22,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * Base Engine.
  *
- * @package Engine
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Engine implements \JsonSerializable
 {
diff --git a/phpseclib/Math/BigInteger/Engines/GMP.php b/phpseclib/Math/BigInteger/Engines/GMP.php
index fc613f3e..f6163629 100644
--- a/phpseclib/Math/BigInteger/Engines/GMP.php
+++ b/phpseclib/Math/BigInteger/Engines/GMP.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Exception\BadConfigurationException;
 /**
  * GMP Engine.
  *
- * @package GMP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class GMP extends Engine
 {
@@ -31,7 +27,6 @@ class GMP extends Engine
      *
      * @see parent::bitwise_leftRotate()
      * @see parent::bitwise_rightRotate()
-     * @access protected
      */
     const FAST_BITWISE = true;
 
@@ -39,7 +34,6 @@ class GMP extends Engine
      * Engine Directory
      *
      * @see parent::setModExpEngine
-     * @access protected
      */
     const ENGINE_DIR = 'GMP';
 
@@ -246,7 +240,6 @@ class GMP extends Engine
      *
      * @param GMP $y
      * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
      * @see self::equals()
      */
     public function compare(GMP $y)
@@ -330,7 +323,6 @@ class GMP extends Engine
      * Absolute value.
      *
      * @return GMP
-     * @access public
      */
     public function abs()
     {
diff --git a/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
index 860a1837..bc219fbe 100644
--- a/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
+++ b/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\GMP;
 /**
  * GMP Modular Exponentiation Engine
  *
- * @package GMP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DefaultEngine extends GMP
 {
diff --git a/phpseclib/Math/BigInteger/Engines/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/OpenSSL.php
index 25468e54..e33a9f19 100644
--- a/phpseclib/Math/BigInteger/Engines/OpenSSL.php
+++ b/phpseclib/Math/BigInteger/Engines/OpenSSL.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\BigInteger;
 /**
  * OpenSSL Modular Exponentiation Engine
  *
- * @package Engines
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSL
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP.php b/phpseclib/Math/BigInteger/Engines/PHP.php
index b363083d..bd8df301 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Exception\BadConfigurationException;
 /**
  * Pure-PHP Engine.
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PHP extends Engine
 {
@@ -33,7 +29,6 @@ abstract class PHP extends Engine
      * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
      * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
      *
-     * @access protected
      */
     /**
      * $result[self::VALUE] contains the value.
@@ -50,7 +45,6 @@ abstract class PHP extends Engine
      *
      * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
      *
-     * @access private
      */
     const KARATSUBA_CUTOFF = 25;
 
@@ -59,7 +53,6 @@ abstract class PHP extends Engine
      *
      * @see parent::bitwise_leftRotate()
      * @see parent::bitwise_rightRotate()
-     * @access protected
      */
     const FAST_BITWISE = true;
 
@@ -67,7 +60,6 @@ abstract class PHP extends Engine
      * Engine Directory
      *
      * @see parent::setModExpEngine
-     * @access protected
      */
     const ENGINE_DIR = 'PHP';
 
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Base.php b/phpseclib/Math/BigInteger/Engines/PHP/Base.php
index bdc5c37b..40f64bd1 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Base.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Base.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP;
 /**
  * PHP Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Base extends PHP
 {
@@ -31,13 +27,11 @@ abstract class Base extends PHP
      *
      * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
      *
-     * @access private
      */
     const VARIABLE = 0;
     /**
      * $cache[self::DATA] contains the cached data.
      *
-     * @access private
      */
     const DATA = 1;
 
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php b/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
index bf5934a7..6d33532e 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\EvalBarrett;
 /**
  * PHP Default Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class DefaultEngine extends EvalBarrett
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php b/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
index 865beb6c..09f825f9 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -22,9 +20,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\PowerOfTwo;
 /**
  * PHP Montgomery Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Montgomery extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php b/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
index 4e0315eb..eddd25e2 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
 /**
  * OpenSSL Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class OpenSSL extends Progenitor
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
index fb8ca1a1..3518d76f 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Base;
 /**
  * PHP Barrett Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Barrett extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
index 95309fca..54f3b863 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Base;
 /**
  * PHP Classic Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Classic extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
index 5360aebc..39d7305b 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Base;
 /**
  * PHP Dynamic Barrett Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class EvalBarrett extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
index e7364722..a34035e7 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Montgomery as Progenitor;
 /**
  * PHP Montgomery Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Montgomery extends Progenitor
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
index ce190e76..4fed3c3f 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP;
 /**
  * PHP Montgomery Modular Exponentiation Engine with interleaved multiplication
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class MontgomeryMult extends Montgomery
 {
@@ -34,7 +30,6 @@ abstract class MontgomeryMult extends Montgomery
      *
      * @see self::_prepMontgomery()
      * @see self::_montgomery()
-     * @access private
      * @param array $x
      * @param array $y
      * @param array $m
diff --git a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
index c6ec026d..9da133a1 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ use phpseclib3\Math\BigInteger\Engines\PHP\Base;
 /**
  * PHP Power Of Two Modular Exponentiation Engine
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class PowerOfTwo extends Base
 {
diff --git a/phpseclib/Math/BigInteger/Engines/PHP32.php b/phpseclib/Math/BigInteger/Engines/PHP32.php
index 9f233c8b..9042e664 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP32.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP32.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ namespace phpseclib3\Math\BigInteger\Engines;
  *
  * Uses 64-bit floats if int size is 4 bits
  *
- * @package PHP32
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PHP32 extends PHP
 {
@@ -247,7 +243,6 @@ class PHP32 extends PHP
      *
      * @param PHP32 $y
      * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
      * @see self::equals()
      */
     public function compare(PHP32 $y)
diff --git a/phpseclib/Math/BigInteger/Engines/PHP64.php b/phpseclib/Math/BigInteger/Engines/PHP64.php
index a573e479..ca11c08d 100644
--- a/phpseclib/Math/BigInteger/Engines/PHP64.php
+++ b/phpseclib/Math/BigInteger/Engines/PHP64.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -20,9 +18,7 @@ namespace phpseclib3\Math\BigInteger\Engines;
  *
  * Uses 64-bit integers if int size is 8 bits
  *
- * @package PHP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PHP64 extends PHP
 {
@@ -251,7 +247,6 @@ class PHP64 extends PHP
      *
      * @param PHP64 $y
      * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @access public
      * @see self::equals()
      */
     public function compare(PHP64 $y)
diff --git a/phpseclib/Math/BinaryField.php b/phpseclib/Math/BinaryField.php
index 62f446b2..3e21a67a 100644
--- a/phpseclib/Math/BinaryField.php
+++ b/phpseclib/Math/BinaryField.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ use phpseclib3\Math\Common\FiniteField;
 /**
  * Binary Finite Fields
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class BinaryField extends FiniteField
 {
diff --git a/phpseclib/Math/BinaryField/Integer.php b/phpseclib/Math/BinaryField/Integer.php
index 7816e625..f95b2dd3 100644
--- a/phpseclib/Math/BinaryField/Integer.php
+++ b/phpseclib/Math/BinaryField/Integer.php
@@ -13,8 +13,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -30,9 +28,7 @@ use phpseclib3\Math\Common\FiniteField\Integer as Base;
 /**
  * Binary Finite Fields
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Integer extends Base
 {
@@ -503,7 +499,6 @@ class Integer extends Base
     /**
      *  __toString() magic method
      *
-     * @access public
      */
     public function __toString()
     {
@@ -513,7 +508,6 @@ class Integer extends Base
     /**
      *  __debugInfo() magic method
      *
-     * @access public
      */
     public function __debugInfo()
     {
diff --git a/phpseclib/Math/Common/FiniteField.php b/phpseclib/Math/Common/FiniteField.php
index 599959ff..2ea5f485 100644
--- a/phpseclib/Math/Common/FiniteField.php
+++ b/phpseclib/Math/Common/FiniteField.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -17,9 +15,7 @@ namespace phpseclib3\Math\Common;
 /**
  * Finite Fields
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class FiniteField
 {
diff --git a/phpseclib/Math/Common/FiniteField/Integer.php b/phpseclib/Math/Common/FiniteField/Integer.php
index cd980273..4197ed37 100644
--- a/phpseclib/Math/Common/FiniteField/Integer.php
+++ b/phpseclib/Math/Common/FiniteField/Integer.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -17,9 +15,7 @@ namespace phpseclib3\Math\Common\FiniteField;
 /**
  * Finite Field Integer
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 abstract class Integer implements \JsonSerializable
 {
diff --git a/phpseclib/Math/PrimeField.php b/phpseclib/Math/PrimeField.php
index 48a8b619..227bfd34 100644
--- a/phpseclib/Math/PrimeField.php
+++ b/phpseclib/Math/PrimeField.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -23,9 +21,7 @@ use phpseclib3\Math\PrimeField\Integer;
 /**
  * Prime Finite Fields
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class PrimeField extends FiniteField
 {
diff --git a/phpseclib/Math/PrimeField/Integer.php b/phpseclib/Math/PrimeField/Integer.php
index 5e911207..0aa05417 100644
--- a/phpseclib/Math/PrimeField/Integer.php
+++ b/phpseclib/Math/PrimeField/Integer.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5 and 7
  *
- * @category  Math
- * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2017 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -21,9 +19,7 @@ use phpseclib3\Math\Common\FiniteField\Integer as Base;
 /**
  * Prime Finite Fields
  *
- * @package Math
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Integer extends Base
 {
@@ -401,7 +397,6 @@ class Integer extends Base
     /**
      *  __toString() magic method
      *
-     * @access public
      * @return string
      */
     public function __toString()
@@ -412,7 +407,6 @@ class Integer extends Base
     /**
      *  __debugInfo() magic method
      *
-     * @access public
      * @return array
      */
     public function __debugInfo()
diff --git a/phpseclib/Net/SFTP.php b/phpseclib/Net/SFTP.php
index ec0a2d69..46432db4 100644
--- a/phpseclib/Net/SFTP.php
+++ b/phpseclib/Net/SFTP.php
@@ -25,8 +25,6 @@
  * ?>
  * </code>
  *
- * @category  Net
- * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -41,9 +39,7 @@ use phpseclib3\Exception\FileNotFoundException;
 /**
  * Pure-PHP implementations of SFTP.
  *
- * @package SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class SFTP extends SSH2
 {
@@ -54,21 +50,18 @@ class SFTP extends SSH2
      *
      * @see \phpseclib3\Net\SSH2::send_channel_packet()
      * @see \phpseclib3\Net\SSH2::get_channel_packet()
-     * @access private
      */
     const CHANNEL = 0x100;
 
     /**
      * Reads data from a local file.
      *
-     * @access public
      * @see \phpseclib3\Net\SFTP::put()
      */
     const SOURCE_LOCAL_FILE = 1;
     /**
      * Reads data from a string.
      *
-     * @access public
      * @see \phpseclib3\Net\SFTP::put()
      */
     // this value isn't really used anymore but i'm keeping it reserved for historical reasons
@@ -77,21 +70,18 @@ class SFTP extends SSH2
      * Reads data from callback:
      * function callback($length) returns string to proceed, null for EOF
      *
-     * @access public
      * @see \phpseclib3\Net\SFTP::put()
      */
     const SOURCE_CALLBACK = 16;
     /**
      * Resumes an upload
      *
-     * @access public
      * @see \phpseclib3\Net\SFTP::put()
      */
     const RESUME = 4;
     /**
      * Append a local file to an already existing remote file
      *
-     * @access public
      * @see \phpseclib3\Net\SFTP::put()
      */
     const RESUME_START = 8;
@@ -134,7 +124,6 @@ class SFTP extends SSH2
      *
      * @var boolean
      * @see self::_send_sftp_packet()
-     * @access private
      */
     private $use_request_id = false;
 
@@ -146,7 +135,6 @@ class SFTP extends SSH2
      *
      * @var int
      * @see self::_get_sftp_packet()
-     * @access private
      */
     private $packet_type = -1;
 
@@ -155,7 +143,6 @@ class SFTP extends SSH2
      *
      * @var string
      * @see self::_get_sftp_packet()
-     * @access private
      */
     private $packet_buffer = '';
 
@@ -164,7 +151,6 @@ class SFTP extends SSH2
      *
      * @var array
      * @see self::_initChannel()
-     * @access private
      */
     private $extensions = [];
 
@@ -173,7 +159,6 @@ class SFTP extends SSH2
      *
      * @var int
      * @see self::_initChannel()
-     * @access private
      */
     private $version;
 
@@ -182,7 +167,6 @@ class SFTP extends SSH2
      *
      * @var int
      * @see self::_initChannel()
-     * @access private
      */
     private $defaultVersion;
 
@@ -191,7 +175,6 @@ class SFTP extends SSH2
      *
      * @var int
      * @see self::_initChannel()
-     * @access private
      */
     private $preferredVersion = 3;
 
@@ -201,7 +184,6 @@ class SFTP extends SSH2
      * @var string|bool
      * @see self::realpath()
      * @see self::chdir()
-     * @access private
      */
     private $pwd = false;
 
@@ -210,7 +192,6 @@ class SFTP extends SSH2
      *
      * @see self::getLog()
      * @var array
-     * @access private
      */
     private $packet_type_log = [];
 
@@ -219,7 +200,6 @@ class SFTP extends SSH2
      *
      * @see self::getLog()
      * @var array
-     * @access private
      */
     private $packet_log = [];
 
@@ -229,7 +209,6 @@ class SFTP extends SSH2
      * @see self::getSFTPErrors()
      * @see self::getLastSFTPError()
      * @var array
-     * @access private
      */
     private $sftp_errors = [];
 
@@ -243,7 +222,6 @@ class SFTP extends SSH2
      * @see self::_remove_from_stat_cache()
      * @see self::_query_stat_cache()
      * @var array
-     * @access private
      */
     private $stat_cache = [];
 
@@ -253,7 +231,6 @@ class SFTP extends SSH2
      * @see self::__construct()
      * @see self::get()
      * @var int
-     * @access private
      */
     private $max_sftp_packet;
 
@@ -263,7 +240,6 @@ class SFTP extends SSH2
      * @see self::disableStatCache()
      * @see self::enableStatCache()
      * @var bool
-     * @access private
      */
     private $use_stat_cache = true;
 
@@ -273,7 +249,6 @@ class SFTP extends SSH2
      * @see self::_comparator()
      * @see self::setListOrder()
      * @var array
-     * @access private
      */
     protected $sortOptions = [];
 
@@ -287,7 +262,6 @@ class SFTP extends SSH2
      * @see self::disablePathCanonicalization()
      * @see self::realpath()
      * @var bool
-     * @access private
      */
     private $canonicalize_paths = true;
 
@@ -296,7 +270,6 @@ class SFTP extends SSH2
      *
      * @see self::_get_sftp_packet()
      * @var array
-     * @access private
      */
     private $requestBuffer = [];
 
@@ -306,7 +279,6 @@ class SFTP extends SSH2
      * @see self::get()
      * @see self::put()
      * @var bool
-     * @access private
      */
     private $preserveTime = false;
 
@@ -321,7 +293,6 @@ class SFTP extends SSH2
      * @see self::enableArbitraryLengthPackets()
      * @see self::_get_sftp_packet()
      * @var bool
-     * @access private
      */
     private $allow_arbitrary_length_packets = false;
 
@@ -331,7 +302,6 @@ class SFTP extends SSH2
      * @see self::get()
      * @see self::get_sftp_packet()
      * @var bool
-     * @access private
      */
     private $channel_close = false;
 
@@ -339,7 +309,6 @@ class SFTP extends SSH2
      * Has the SFTP channel been partially negotiated?
      *
      * @var bool
-     * @access private
      */
     private $partial_init = false;
 
@@ -351,7 +320,6 @@ class SFTP extends SSH2
      * @param string $host
      * @param int $port
      * @param int $timeout
-     * @access public
      */
     public function __construct($host, $port = 22, $timeout = 10)
     {
@@ -520,7 +488,6 @@ class SFTP extends SSH2
      * Check a few things before SFTP functions are called
      *
      * @return bool
-     * @access public
      */
     private function precheck()
     {
@@ -540,7 +507,6 @@ class SFTP extends SSH2
      *
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access public
      */
     private function partial_init_sftp_connection()
     {
@@ -630,7 +596,6 @@ class SFTP extends SSH2
      * (Re)initializes the SFTP channel
      *
      * @return bool
-     * @access private
      */
     private function init_sftp_connection()
     {
@@ -721,7 +686,6 @@ class SFTP extends SSH2
     /**
      * Disable the stat cache
      *
-     * @access public
      */
     public function disableStatCache()
     {
@@ -731,7 +695,6 @@ class SFTP extends SSH2
     /**
      * Enable the stat cache
      *
-     * @access public
      */
     public function enableStatCache()
     {
@@ -741,7 +704,6 @@ class SFTP extends SSH2
     /**
      * Clear the stat cache
      *
-     * @access public
      */
     public function clearStatCache()
     {
@@ -751,7 +713,6 @@ class SFTP extends SSH2
     /**
      * Enable path canonicalization
      *
-     * @access public
      */
     public function enablePathCanonicalization()
     {
@@ -761,7 +722,6 @@ class SFTP extends SSH2
     /**
      * Enable path canonicalization
      *
-     * @access public
      */
     public function disablePathCanonicalization()
     {
@@ -771,7 +731,6 @@ class SFTP extends SSH2
     /**
      * Enable arbitrary length packets
      *
-     * @access public
      */
     public function enableArbitraryLengthPackets()
     {
@@ -781,7 +740,6 @@ class SFTP extends SSH2
     /**
      * Disable arbitrary length packets
      *
-     * @access public
      */
     public function disableArbitraryLengthPackets()
     {
@@ -792,7 +750,6 @@ class SFTP extends SSH2
      * Returns the current directory name
      *
      * @return string|bool
-     * @access public
      */
     public function pwd()
     {
@@ -808,7 +765,6 @@ class SFTP extends SSH2
      *
      * @param string $response
      * @param int $status
-     * @access private
      */
     private function logError($response, $status = -1)
     {
@@ -839,7 +795,6 @@ class SFTP extends SSH2
      * @param string $path
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
-     * @access public
      */
     public function realpath($path)
     {
@@ -902,7 +857,6 @@ class SFTP extends SSH2
      * @param string $dir
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access public
      */
     public function chdir($dir)
     {
@@ -963,7 +917,6 @@ class SFTP extends SSH2
      * @param string $dir
      * @param bool $recursive
      * @return array|false
-     * @access public
      */
     public function nlist($dir = '.', $recursive = false)
     {
@@ -977,7 +930,6 @@ class SFTP extends SSH2
      * @param bool $recursive
      * @param string $relativeDir
      * @return array|false
-     * @access private
      */
     private function nlist_helper($dir, $recursive, $relativeDir)
     {
@@ -1011,7 +963,6 @@ class SFTP extends SSH2
      * @param string $dir
      * @param bool $recursive
      * @return array|false
-     * @access public
      */
     public function rawlist($dir = '.', $recursive = false)
     {
@@ -1056,7 +1007,6 @@ class SFTP extends SSH2
      * @param bool $raw
      * @return array|false
      * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
      */
     private function readlist($dir, $raw = true)
     {
@@ -1164,7 +1114,6 @@ class SFTP extends SSH2
      * @param array $a
      * @param array $b
      * @return int
-     * @access private
      */
     private function comparator($a, $b)
     {
@@ -1239,7 +1188,6 @@ class SFTP extends SSH2
      *    Don't do any sort of sorting
      *
      * @param string ...$args
-     * @access public
      */
     public function setListOrder(...$args)
     {
@@ -1261,7 +1209,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @param mixed $value
-     * @access private
      */
     private function update_stat_cache($path, $value)
     {
@@ -1305,7 +1252,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access private
      */
     private function remove_from_stat_cache($path)
     {
@@ -1335,7 +1281,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access private
      */
     private function query_stat_cache($path)
     {
@@ -1361,7 +1306,6 @@ class SFTP extends SSH2
      *
      * @param string $filename
      * @return array|false
-     * @access public
      */
     public function stat($filename)
     {
@@ -1418,7 +1362,6 @@ class SFTP extends SSH2
      *
      * @param string $filename
      * @return array|false
-     * @access public
      */
     public function lstat($filename)
     {
@@ -1486,7 +1429,6 @@ class SFTP extends SSH2
      * @param int $type
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return array|false
-     * @access private
      */
     private function stat_helper($filename, $type)
     {
@@ -1513,7 +1455,6 @@ class SFTP extends SSH2
      * @param string $filename
      * @param int $new_size
      * @return bool
-     * @access public
      */
     public function truncate($filename, $new_size)
     {
@@ -1532,7 +1473,6 @@ class SFTP extends SSH2
      * @param int $atime
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access public
      */
     public function touch($filename, $time = null, $atime = null)
     {
@@ -1593,7 +1533,6 @@ class SFTP extends SSH2
      * @param int|string $uid
      * @param bool $recursive
      * @return bool
-     * @access public
      */
     public function chown($filename, $uid, $recursive = false)
     {
@@ -1641,7 +1580,6 @@ class SFTP extends SSH2
      * @param int|string $gid
      * @param bool $recursive
      * @return bool
-     * @access public
      */
     public function chgrp($filename, $gid, $recursive = false)
     {
@@ -1663,7 +1601,6 @@ class SFTP extends SSH2
      * @param bool $recursive
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
-     * @access public
      */
     public function chmod($mode, $filename, $recursive = false)
     {
@@ -1710,7 +1647,6 @@ class SFTP extends SSH2
      * @param bool $recursive
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access private
      */
     private function setstat($filename, $attr, $recursive)
     {
@@ -1769,7 +1705,6 @@ class SFTP extends SSH2
      * @param string $attr
      * @param int $i
      * @return bool
-     * @access private
      */
     private function setstat_recursive($path, $attr, &$i)
     {
@@ -1842,7 +1777,6 @@ class SFTP extends SSH2
      * @param string $link
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
-     * @access public
      */
     public function readlink($link)
     {
@@ -1886,7 +1820,6 @@ class SFTP extends SSH2
      * @param string $link
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access public
      */
     public function symlink($target, $link)
     {
@@ -1951,7 +1884,6 @@ class SFTP extends SSH2
      * @param int $mode
      * @param bool $recursive
      * @return bool
-     * @access public
      */
     public function mkdir($dir, $mode = -1, $recursive = false)
     {
@@ -1984,7 +1916,6 @@ class SFTP extends SSH2
      * @param string $dir
      * @param int $mode
      * @return bool
-     * @access private
      */
     private function mkdir_helper($dir, $mode)
     {
@@ -2016,7 +1947,6 @@ class SFTP extends SSH2
      * @param string $dir
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
-     * @access public
      */
     public function rmdir($dir)
     {
@@ -2101,7 +2031,6 @@ class SFTP extends SSH2
      * @throws \BadFunctionCallException if you're uploading via a callback and the callback function is invalid
      * @throws \phpseclib3\Exception\FileNotFoundException if you're uploading via a file and the file doesn't exist
      * @return bool
-     * @access public
      */
     public function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
     {
@@ -2290,7 +2219,6 @@ class SFTP extends SSH2
      * @param int $i
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
      */
     private function read_put_responses($i)
     {
@@ -2317,7 +2245,6 @@ class SFTP extends SSH2
      * @param string $handle
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access private
      */
     private function close_handle($handle)
     {
@@ -2356,7 +2283,6 @@ class SFTP extends SSH2
      * @param callable|null $progressCallback
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return string|false
-     * @access public
      */
     public function get($remote_file, $local_file = false, $offset = 0, $length = -1, $progressCallback = null)
     {
@@ -2521,7 +2447,6 @@ class SFTP extends SSH2
      * @param bool $recursive
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access public
      */
     public function delete($path, $recursive = true)
     {
@@ -2579,7 +2504,6 @@ class SFTP extends SSH2
      * @param string $path
      * @param int $i
      * @return bool
-     * @access private
      */
     private function delete_recursive($path, &$i)
     {
@@ -2641,7 +2565,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function file_exists($path)
     {
@@ -2668,7 +2591,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_dir($path)
     {
@@ -2684,7 +2606,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_file($path)
     {
@@ -2700,7 +2621,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_link($path)
     {
@@ -2716,7 +2636,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_readable($path)
     {
@@ -2744,7 +2663,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_writable($path)
     {
@@ -2774,7 +2692,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     public function is_writeable($path)
     {
@@ -2786,7 +2703,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function fileatime($path)
     {
@@ -2798,7 +2714,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function filemtime($path)
     {
@@ -2810,7 +2725,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function fileperms($path)
     {
@@ -2822,7 +2736,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function fileowner($path)
     {
@@ -2834,7 +2747,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function filegroup($path)
     {
@@ -2846,7 +2758,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
-     * @access public
      */
     public function filesize($path)
     {
@@ -2858,7 +2769,6 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return string|false
-     * @access public
      */
     public function filetype($path)
     {
@@ -2893,7 +2803,6 @@ class SFTP extends SSH2
      * @param string $path
      * @param string $prop
      * @return mixed
-     * @access private
      */
     private function get_stat_cache_prop($path, $prop)
     {
@@ -2908,7 +2817,6 @@ class SFTP extends SSH2
      * @param string $path
      * @param string $prop
      * @return mixed
-     * @access private
      */
     private function get_lstat_cache_prop($path, $prop)
     {
@@ -2924,7 +2832,6 @@ class SFTP extends SSH2
      * @param string $prop
      * @param string $type
      * @return mixed
-     * @access private
      */
     private function get_xstat_cache_prop($path, $prop, $type)
     {
@@ -2960,7 +2867,6 @@ class SFTP extends SSH2
      * @param string $newname
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @access public
      */
     public function rename($oldname, $newname)
     {
@@ -3021,7 +2927,6 @@ class SFTP extends SSH2
      * @param int $flags
      * @param string $response
      * @return array
-     * @access private
      */
     private function parseTime($key, $flags, &$response)
     {
@@ -3040,7 +2945,6 @@ class SFTP extends SSH2
      *
      * @param string $response
      * @return array
-     * @access private
      */
     protected function parseAttributes(&$response)
     {
@@ -3187,7 +3091,6 @@ class SFTP extends SSH2
      *
      * @param int $mode
      * @return int
-     * @access private
      */
     private function parseMode($mode)
     {
@@ -3234,7 +3137,6 @@ class SFTP extends SSH2
      *
      * @param string $longname
      * @return mixed
-     * @access private
      */
     private function parseLongname($longname)
     {
@@ -3267,7 +3169,6 @@ class SFTP extends SSH2
      * @see self::_get_sftp_packet()
      * @see self::send_channel_packet()
      * @return void
-     * @access private
      */
     private function send_sftp_packet($type, $data, $request_id = 1)
     {
@@ -3311,7 +3212,6 @@ class SFTP extends SSH2
      * Resets a connection for re-use
      *
      * @param int $reason
-     * @access private
      */
     protected function reset_connection($reason)
     {
@@ -3332,7 +3232,6 @@ class SFTP extends SSH2
      *
      * @see self::_send_sftp_packet()
      * @return string
-     * @access private
      */
     private function get_sftp_packet($request_id = null)
     {
@@ -3442,7 +3341,6 @@ class SFTP extends SSH2
      *
      * Returns a string if NET_SFTP_LOGGING == self::LOG_COMPLEX, an array if NET_SFTP_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
      *
-     * @access public
      * @return array|string
      */
     public function getSFTPLog()
@@ -3465,7 +3363,6 @@ class SFTP extends SSH2
      * Returns all errors
      *
      * @return array
-     * @access public
      */
     public function getSFTPErrors()
     {
@@ -3476,7 +3373,6 @@ class SFTP extends SSH2
      * Returns the last error
      *
      * @return string
-     * @access public
      */
     public function getLastSFTPError()
     {
@@ -3487,7 +3383,6 @@ class SFTP extends SSH2
      * Get supported SFTP versions
      *
      * @return array
-     * @access public
      */
     public function getSupportedVersions()
     {
@@ -3510,7 +3405,6 @@ class SFTP extends SSH2
      * Get supported SFTP versions
      *
      * @return int|false
-     * @access public
      */
     public function getNegotiatedVersion()
     {
@@ -3529,7 +3423,6 @@ class SFTP extends SSH2
      * unset the preferred version
      *
      * @param int $version
-     * @access public
      */
     public function setPreferredVersion($version)
     {
@@ -3541,7 +3434,6 @@ class SFTP extends SSH2
      *
      * @param int $reason
      * @return false
-     * @access protected
      */
     protected function disconnect_helper($reason)
     {
@@ -3552,7 +3444,6 @@ class SFTP extends SSH2
     /**
      * Enable Date Preservation
      *
-     * @access public
      */
     public function enableDatePreservation()
     {
@@ -3562,7 +3453,6 @@ class SFTP extends SSH2
     /**
      * Disable Date Preservation
      *
-     * @access public
      */
     public function disableDatePreservation()
     {
diff --git a/phpseclib/Net/SFTP/Stream.php b/phpseclib/Net/SFTP/Stream.php
index ccee1593..da3f0550 100644
--- a/phpseclib/Net/SFTP/Stream.php
+++ b/phpseclib/Net/SFTP/Stream.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  Net
- * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2013 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -24,9 +22,7 @@ use phpseclib3\Net\SSH2;
 /**
  * SFTP Stream Wrapper
  *
- * @package SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Stream
 {
@@ -43,7 +39,6 @@ class Stream
      * SFTP instance
      *
      * @var object
-     * @access private
      */
     private $sftp;
 
@@ -51,7 +46,6 @@ class Stream
      * Path
      *
      * @var string
-     * @access private
      */
     private $path;
 
@@ -59,7 +53,6 @@ class Stream
      * Mode
      *
      * @var string
-     * @access private
      */
     private $mode;
 
@@ -67,7 +60,6 @@ class Stream
      * Position
      *
      * @var int
-     * @access private
      */
     private $pos;
 
@@ -75,7 +67,6 @@ class Stream
      * Size
      *
      * @var int
-     * @access private
      */
     private $size;
 
@@ -83,7 +74,6 @@ class Stream
      * Directory entries
      *
      * @var array
-     * @access private
      */
     private $entries;
 
@@ -91,7 +81,6 @@ class Stream
      * EOF flag
      *
      * @var bool
-     * @access private
      */
     private $eof;
 
@@ -101,7 +90,6 @@ class Stream
      * Technically this needs to be publicly accessible so PHP can set it directly
      *
      * @var resource
-     * @access public
      */
     public $context;
 
@@ -109,7 +97,6 @@ class Stream
      * Notification callback function
      *
      * @var callable
-     * @access public
      */
     private $notification;
 
@@ -118,7 +105,6 @@ class Stream
      *
      * @param string $protocol The wrapper name to be registered.
      * @return bool True on success, false otherwise.
-     * @access public
      */
     public static function register($protocol = 'sftp')
     {
@@ -131,7 +117,6 @@ class Stream
     /**
      * The Constructor
      *
-     * @access public
      */
     public function __construct()
     {
@@ -150,7 +135,6 @@ class Stream
      *
      * @param string $path
      * @return string
-     * @access private
      */
     protected function parse_path($path)
     {
@@ -255,7 +239,6 @@ class Stream
      * @param int $options
      * @param string $opened_path
      * @return bool
-     * @access public
      */
     private function _stream_open($path, $mode, $options, &$opened_path)
     {
@@ -297,7 +280,6 @@ class Stream
      *
      * @param int $count
      * @return mixed
-     * @access public
      */
     private function _stream_read($count)
     {
@@ -339,7 +321,6 @@ class Stream
      *
      * @param string $data
      * @return int|false
-     * @access public
      */
     private function _stream_write($data)
     {
@@ -373,7 +354,6 @@ class Stream
      * Retrieve the current position of a stream
      *
      * @return int
-     * @access public
      */
     private function _stream_tell()
     {
@@ -391,7 +371,6 @@ class Stream
      * will return false. do fread($fp, 1) and feof() will then return true.
      *
      * @return bool
-     * @access public
      */
     private function _stream_eof()
     {
@@ -404,7 +383,6 @@ class Stream
      * @param int $offset
      * @param int $whence
      * @return bool
-     * @access public
      */
     private function _stream_seek($offset, $whence)
     {
@@ -433,7 +411,6 @@ class Stream
      * @param int $option
      * @param mixed $var
      * @return bool
-     * @access public
      */
     private function _stream_metadata($path, $option, $var)
     {
@@ -467,7 +444,6 @@ class Stream
      *
      * @param int $cast_as
      * @return resource
-     * @access public
      */
     private function _stream_cast($cast_as)
     {
@@ -479,7 +455,6 @@ class Stream
      *
      * @param int $operation
      * @return bool
-     * @access public
      */
     private function _stream_lock($operation)
     {
@@ -496,7 +471,6 @@ class Stream
      * @param string $path_from
      * @param string $path_to
      * @return bool
-     * @access public
      */
     private function _rename($path_from, $path_to)
     {
@@ -548,7 +522,6 @@ class Stream
      * @param string $path
      * @param int $options
      * @return bool
-     * @access public
      */
     private function _dir_opendir($path, $options)
     {
@@ -565,7 +538,6 @@ class Stream
      * Read entry from directory handle
      *
      * @return mixed
-     * @access public
      */
     private function _dir_readdir()
     {
@@ -579,7 +551,6 @@ class Stream
      * Rewind directory handle
      *
      * @return bool
-     * @access public
      */
     private function _dir_rewinddir()
     {
@@ -591,7 +562,6 @@ class Stream
      * Close directory handle
      *
      * @return bool
-     * @access public
      */
     private function _dir_closedir()
     {
@@ -607,7 +577,6 @@ class Stream
      * @param int $mode
      * @param int $options
      * @return bool
-     * @access public
      */
     private function _mkdir($path, $mode, $options)
     {
@@ -630,7 +599,6 @@ class Stream
      * @param string $path
      * @param int $options
      * @return bool
-     * @access public
      */
     private function _rmdir($path, $options)
     {
@@ -648,7 +616,6 @@ class Stream
      * See <http://php.net/fflush>. Always returns true because \phpseclib3\Net\SFTP doesn't cache stuff before writing
      *
      * @return bool
-     * @access public
      */
     private function _stream_flush()
     {
@@ -659,7 +626,6 @@ class Stream
      * Retrieve information about a file resource
      *
      * @return mixed
-     * @access public
      */
     private function _stream_stat()
     {
@@ -675,7 +641,6 @@ class Stream
      *
      * @param string $path
      * @return bool
-     * @access public
      */
     private function _unlink($path)
     {
@@ -697,7 +662,6 @@ class Stream
      * @param string $path
      * @param int $flags
      * @return mixed
-     * @access public
      */
     private function _url_stat($path, $flags)
     {
@@ -719,7 +683,6 @@ class Stream
      *
      * @param int $new_size
      * @return bool
-     * @access public
      */
     private function _stream_truncate($new_size)
     {
@@ -743,7 +706,6 @@ class Stream
      * @param int $arg1
      * @param int $arg2
      * @return bool
-     * @access public
      */
     private function _stream_set_option($option, $arg1, $arg2)
     {
@@ -753,7 +715,6 @@ class Stream
     /**
      * Close an resource
      *
-     * @access public
      */
     private function _stream_close()
     {
@@ -772,7 +733,6 @@ class Stream
      * @param string $name
      * @param array $arguments
      * @return mixed
-     * @access public
      */
     public function __call($name, $arguments)
     {
diff --git a/phpseclib/Net/SSH2.php b/phpseclib/Net/SSH2.php
index 1658c553..70332ddc 100644
--- a/phpseclib/Net/SSH2.php
+++ b/phpseclib/Net/SSH2.php
@@ -37,8 +37,6 @@
  * ?>
  * </code>
  *
- * @category  Net
- * @package   SSH2
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -76,16 +74,13 @@ use phpseclib3\System\SSH\Agent;
 /**
  * Pure-PHP implementation of SSHv2.
  *
- * @package SSH2
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class SSH2
 {
     /**#@+
      * Compression Types
      *
-     * @access private
      */
     /**
      * No compression
@@ -123,7 +118,6 @@ class SSH2
      *
      * @see \phpseclib3\Net\SSH2::send_channel_packet()
      * @see \phpseclib3\Net\SSH2::get_channel_packet()
-     * @access private
      */
     const CHANNEL_EXEC          = 1; // PuTTy uses 0x100
     const CHANNEL_SHELL         = 2;
@@ -134,35 +128,30 @@ class SSH2
     /**
      * Returns the message numbers
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_SIMPLE = 1;
     /**
      * Returns the message content
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_COMPLEX = 2;
     /**
      * Outputs the content real-time
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_REALTIME = 3;
     /**
      * Dumps the content real-time to a file
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_REALTIME_FILE = 4;
     /**
      * Make sure that the log never gets larger than this
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_MAX_SIZE = 1048576; // 1024 * 1024
@@ -170,14 +159,12 @@ class SSH2
     /**
      * Returns when a string matching $expect exactly is found
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::read()
      */
     const READ_SIMPLE = 1;
     /**
      * Returns when a string matching the regular expression $expect is found
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::read()
      */
     const READ_REGEX = 2;
@@ -187,7 +174,6 @@ class SSH2
      * Some data packets may only contain a single character so it may be necessary
      * to call read() multiple times when using this option
      *
-     * @access public
      * @see \phpseclib3\Net\SSH2::read()
      */
     const READ_NEXT = 3;
@@ -196,7 +182,6 @@ class SSH2
      * The SSH identifier
      *
      * @var string
-     * @access private
      */
     private $identifier;
 
@@ -204,7 +189,6 @@ class SSH2
      * The Socket Object
      *
      * @var resource|closed-resource|null
-     * @access private
      */
     public $fsock;
 
@@ -215,7 +199,6 @@ class SSH2
      * if a requisite function has been successfully executed.  If not, an error should be thrown.
      *
      * @var int
-     * @access private
      */
     protected $bitmap = 0;
 
@@ -225,7 +208,6 @@ class SSH2
      * @see self::getErrors()
      * @see self::getLastError()
      * @var array
-     * @access private
      */
     private $errors = [];
 
@@ -234,7 +216,6 @@ class SSH2
      *
      * @see self::getServerIdentification()
      * @var string|false
-     * @access private
      */
     protected $server_identifier = false;
 
@@ -243,7 +224,6 @@ class SSH2
      *
      * @see self::getKexAlgorithims()
      * @var array|false
-     * @access private
      */
     private $kex_algorithms = false;
 
@@ -252,7 +232,6 @@ class SSH2
      *
      * @see self::getMethodsNegotiated()
      * @var string|false
-     * @access private
      */
     private $kex_algorithm = false;
 
@@ -261,7 +240,6 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var int
-     * @access private
      */
     private $kex_dh_group_size_min = 1536;
 
@@ -270,7 +248,6 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var int
-     * @access private
      */
     private $kex_dh_group_size_preferred = 2048;
 
@@ -279,7 +256,6 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var int
-     * @access private
      */
     private $kex_dh_group_size_max = 4096;
 
@@ -288,7 +264,6 @@ class SSH2
      *
      * @see self::getServerHostKeyAlgorithms()
      * @var array|false
-     * @access private
      */
     private $server_host_key_algorithms = false;
 
@@ -297,7 +272,6 @@ class SSH2
      *
      * @see self::getEncryptionAlgorithmsClient2Server()
      * @var array|false
-     * @access private
      */
     private $encryption_algorithms_client_to_server = false;
 
@@ -306,7 +280,6 @@ class SSH2
      *
      * @see self::getEncryptionAlgorithmsServer2Client()
      * @var array|false
-     * @access private
      */
     private $encryption_algorithms_server_to_client = false;
 
@@ -315,7 +288,6 @@ class SSH2
      *
      * @see self::getMACAlgorithmsClient2Server()
      * @var array|false
-     * @access private
      */
     private $mac_algorithms_client_to_server = false;
 
@@ -324,7 +296,6 @@ class SSH2
      *
      * @see self::getMACAlgorithmsServer2Client()
      * @var array|false
-     * @access private
      */
     private $mac_algorithms_server_to_client = false;
 
@@ -333,7 +304,6 @@ class SSH2
      *
      * @see self::getCompressionAlgorithmsClient2Server()
      * @var array|false
-     * @access private
      */
     private $compression_algorithms_client_to_server = false;
 
@@ -342,7 +312,6 @@ class SSH2
      *
      * @see self::getCompressionAlgorithmsServer2Client()
      * @var array|false
-     * @access private
      */
     private $compression_algorithms_server_to_client = false;
 
@@ -351,7 +320,6 @@ class SSH2
      *
      * @see self::getLanguagesServer2Client()
      * @var array|false
-     * @access private
      */
     private $languages_server_to_client = false;
 
@@ -360,7 +328,6 @@ class SSH2
      *
      * @see self::getLanguagesClient2Server()
      * @var array|false
-     * @access private
      */
     private $languages_client_to_server = false;
 
@@ -369,7 +336,6 @@ class SSH2
      *
      * @see self::setPreferredAlgorithms()
      * @var array
-     * @access private
      */
     private $preferred = [];
 
@@ -386,7 +352,6 @@ class SSH2
      * @see self::__construct()
      * @see self::_send_binary_packet()
      * @var int
-     * @access private
      */
     private $encrypt_block_size = 8;
 
@@ -396,7 +361,6 @@ class SSH2
      * @see self::__construct()
      * @see self::_get_binary_packet()
      * @var int
-     * @access private
      */
     private $decrypt_block_size = 8;
 
@@ -405,7 +369,6 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var SymmetricKey|false
-     * @access private
      */
     private $decrypt = false;
 
@@ -413,7 +376,6 @@ class SSH2
      * Decryption Algorithm Name
      *
      * @var string|null
-     * @access private
      */
     private $decryptName;
 
@@ -423,7 +385,6 @@ class SSH2
      * Used by GCM
      *
      * @var string|null
-     * @access private
      */
     private $decryptInvocationCounter;
 
@@ -433,7 +394,6 @@ class SSH2
      * Used by GCM
      *
      * @var string|null
-     * @access private
      */
     private $decryptFixedPart;
 
@@ -442,7 +402,6 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var object
-     * @access private
      */
     private $lengthDecrypt = false;
 
@@ -451,7 +410,6 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @var SymmetricKey|false
-     * @access private
      */
     private $encrypt = false;
 
@@ -459,7 +417,6 @@ class SSH2
      * Encryption Algorithm Name
      *
      * @var string|null
-     * @access private
      */
     private $encryptName;
 
@@ -469,7 +426,6 @@ class SSH2
      * Used by GCM
      *
      * @var string|null
-     * @access private
      */
     private $encryptInvocationCounter;
 
@@ -479,7 +435,6 @@ class SSH2
      * Used by GCM
      *
      * @var string|null
-     * @access private
      */
     private $encryptFixedPart;
 
@@ -488,7 +443,6 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @var object
-     * @access private
      */
     private $lengthEncrypt = false;
 
@@ -497,7 +451,6 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @var object
-     * @access private
      */
     private $hmac_create = false;
 
@@ -505,7 +458,6 @@ class SSH2
      * Client to Server HMAC Name
      *
      * @var string|false
-     * @access private
      */
     private $hmac_create_name;
 
@@ -513,7 +465,6 @@ class SSH2
      * Client to Server ETM
      *
      * @var int|false
-     * @access private
      */
     private $hmac_create_etm;
 
@@ -522,7 +473,6 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var object
-     * @access private
      */
     private $hmac_check = false;
 
@@ -530,7 +480,6 @@ class SSH2
      * Server to Client HMAC Name
      *
      * @var string|false
-     * @access private
      */
     private $hmac_check_name;
 
@@ -538,7 +487,6 @@ class SSH2
      * Server to Client ETM
      *
      * @var int|false
-     * @access private
      */
     private $hmac_check_etm;
 
@@ -551,7 +499,6 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var int
-     * @access private
      */
     private $hmac_size = false;
 
@@ -560,7 +507,6 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var string
-     * @access private
      */
     private $server_public_host_key;
 
@@ -575,7 +521,6 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var string
-     * @access private
      */
     private $session_id = false;
 
@@ -586,7 +531,6 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var string
-     * @access private
      */
     private $exchange_hash = false;
 
@@ -644,7 +588,6 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @var int
-     * @access private
      */
     private $send_seq_no = 0;
 
@@ -655,7 +598,6 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var int
-     * @access private
      */
     private $get_seq_no = 0;
 
@@ -667,7 +609,6 @@ class SSH2
      * @see self::get_channel_packet()
      * @see self::exec()
      * @var array
-     * @access private
      */
     protected $server_channels = [];
 
@@ -680,7 +621,6 @@ class SSH2
      * @see self::get_channel_packet()
      * @see self::exec()
      * @var array
-     * @access private
      */
     private $channel_buffers = [];
 
@@ -691,7 +631,6 @@ class SSH2
      *
      * @see self::get_channel_packet()
      * @var array
-     * @access private
      */
     protected $channel_status = [];
 
@@ -702,7 +641,6 @@ class SSH2
      *
      * @see self::send_channel_packet()
      * @var array
-     * @access private
      */
     private $packet_size_client_to_server = [];
 
@@ -711,7 +649,6 @@ class SSH2
      *
      * @see self::getLog()
      * @var array
-     * @access private
      */
     private $message_number_log = [];
 
@@ -720,7 +657,6 @@ class SSH2
      *
      * @see self::getLog()
      * @var array
-     * @access private
      */
     private $message_log = [];
 
@@ -732,7 +668,6 @@ class SSH2
      * @var int
      * @see self::send_channel_packet()
      * @see self::exec()
-     * @access private
      */
     protected $window_size = 0x7FFFFFFF;
 
@@ -746,7 +681,6 @@ class SSH2
      * @var int
      * @see self::_send_channel_packet()
      * @see self::exec()
-     * @access private
      */
     private $window_resize = 0x40000000;
 
@@ -757,7 +691,6 @@ class SSH2
      *
      * @see self::send_channel_packet()
      * @var array
-     * @access private
      */
     protected $window_size_server_to_client = [];
 
@@ -768,7 +701,6 @@ class SSH2
      *
      * @see self::get_channel_packet()
      * @var array
-     * @access private
      */
     private $window_size_client_to_server = [];
 
@@ -779,7 +711,6 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var string
-     * @access private
      */
     private $signature = '';
 
@@ -790,7 +721,6 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var string
-     * @access private
      */
     private $signature_format = '';
 
@@ -799,7 +729,6 @@ class SSH2
      *
      * @see self::read()
      * @var string
-     * @access private
      */
     private $interactiveBuffer = '';
 
@@ -811,7 +740,6 @@ class SSH2
      * @see self::_send_binary_packet()
      * @see self::_get_binary_packet()
      * @var int
-     * @access private
      */
     private $log_size;
 
@@ -819,7 +747,6 @@ class SSH2
      * Timeout
      *
      * @see self::setTimeout()
-     * @access private
      */
     protected $timeout;
 
@@ -827,7 +754,6 @@ class SSH2
      * Current Timeout
      *
      * @see self::get_channel_packet()
-     * @access private
      */
     protected $curTimeout;
 
@@ -835,7 +761,6 @@ class SSH2
      * Keep Alive Interval
      *
      * @see self::setKeepAlive()
-     * @access private
      */
     private $keepAlive;
 
@@ -844,7 +769,6 @@ class SSH2
      *
      * @see self::_append_log()
      * @var resource|closed-resource
-     * @access private
      */
     private $realtime_log_file;
 
@@ -853,7 +777,6 @@ class SSH2
      *
      * @see self::_append_log()
      * @var int
-     * @access private
      */
     private $realtime_log_size;
 
@@ -862,7 +785,6 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var bool
-     * @access private
      */
     private $signature_validated = false;
 
@@ -870,7 +792,6 @@ class SSH2
      * Real-time log file wrap boolean
      *
      * @see self::_append_log()
-     * @access private
      */
     private $realtime_log_wrap;
 
@@ -878,7 +799,6 @@ class SSH2
      * Flag to suppress stderr from output
      *
      * @see self::enableQuietMode()
-     * @access private
      */
     private $quiet_mode = false;
 
@@ -886,7 +806,6 @@ class SSH2
      * Time of first network activity
      *
      * @var float
-     * @access private
      */
     private $last_packet;
 
@@ -894,7 +813,6 @@ class SSH2
      * Exit status returned from ssh if any
      *
      * @var int
-     * @access private
      */
     private $exit_status;
 
@@ -903,7 +821,6 @@ class SSH2
      *
      * @var bool
      * @see self::enablePTY()
-     * @access private
      */
     private $request_pty = false;
 
@@ -911,7 +828,6 @@ class SSH2
      * Flag set while exec() is running when using enablePTY()
      *
      * @var bool
-     * @access private
      */
     private $in_request_pty_exec = false;
 
@@ -919,7 +835,6 @@ class SSH2
      * Flag set after startSubsystem() is called
      *
      * @var bool
-     * @access private
      */
     private $in_subsystem;
 
@@ -927,7 +842,6 @@ class SSH2
      * Contents of stdError
      *
      * @var string
-     * @access private
      */
     private $stdErrorLog;
 
@@ -936,7 +850,6 @@ class SSH2
      *
      * @see self::_keyboard_interactive_process()
      * @var string
-     * @access private
      */
     private $last_interactive_response = '';
 
@@ -945,7 +858,6 @@ class SSH2
      *
      * @see self::_keyboard_interactive_process()
      * @var array
-     * @access private
      */
     private $keyboard_requests_responses = [];
 
@@ -958,7 +870,6 @@ class SSH2
      * @see self::_filter()
      * @see self::getBannerMessage()
      * @var string
-     * @access private
      */
     private $banner_message = '';
 
@@ -967,7 +878,6 @@ class SSH2
      *
      * @see self::isTimeout()
      * @var bool
-     * @access private
      */
     private $is_timeout = false;
 
@@ -976,7 +886,6 @@ class SSH2
      *
      * @see self::_format_log()
      * @var string
-     * @access private
      */
     private $log_boundary = ':';
 
@@ -985,7 +894,6 @@ class SSH2
      *
      * @see self::_format_log()
      * @var int
-     * @access private
      */
     private $log_long_width = 65;
 
@@ -994,7 +902,6 @@ class SSH2
      *
      * @see self::_format_log()
      * @var int
-     * @access private
      */
     private $log_short_width = 16;
 
@@ -1004,7 +911,6 @@ class SSH2
      * @see self::__construct()
      * @see self::_connect()
      * @var string
-     * @access private
      */
     private $host;
 
@@ -1014,7 +920,6 @@ class SSH2
      * @see self::__construct()
      * @see self::_connect()
      * @var int
-     * @access private
      */
     private $port;
 
@@ -1025,7 +930,6 @@ class SSH2
      * @see self::setWindowColumns()
      * @see self::setWindowSize()
      * @var int
-     * @access private
      */
     private $windowColumns = 80;
 
@@ -1036,7 +940,6 @@ class SSH2
      * @see self::setWindowRows()
      * @see self::setWindowSize()
      * @var int
-     * @access private
      */
     private $windowRows = 24;
 
@@ -1046,7 +949,6 @@ class SSH2
      * @see self::setCryptoEngine()
      * @see self::_key_exchange()
      * @var int
-     * @access private
      */
     private static $crypto_engine = false;
 
@@ -1054,7 +956,6 @@ class SSH2
      * A System_SSH_Agent for use in the SSH2 Agent Forwarding scenario
      *
      * @var Agent
-     * @access private
      */
     private $agent;
 
@@ -1070,7 +971,6 @@ class SSH2
      * Send the identification string first?
      *
      * @var bool
-     * @access private
      */
     private $send_id_string_first = true;
 
@@ -1078,7 +978,6 @@ class SSH2
      * Send the key exchange initiation packet first?
      *
      * @var bool
-     * @access private
      */
     private $send_kex_first = true;
 
@@ -1086,7 +985,6 @@ class SSH2
      * Some versions of OpenSSH incorrectly calculate the key size
      *
      * @var bool
-     * @access private
      */
     private $bad_key_size_fix = false;
 
@@ -1094,7 +992,6 @@ class SSH2
      * Should we try to re-connect to re-establish keys?
      *
      * @var bool
-     * @access private
      */
     private $retry_connect = false;
 
@@ -1102,7 +999,6 @@ class SSH2
      * Binary Packet Buffer
      *
      * @var string|false
-     * @access private
      */
     private $binary_packet_buffer = false;
 
@@ -1110,7 +1006,6 @@ class SSH2
      * Preferred Signature Format
      *
      * @var string|false
-     * @access private
      */
     protected $preferred_signature_format = false;
 
@@ -1118,7 +1013,6 @@ class SSH2
      * Authentication Credentials
      *
      * @var array
-     * @access private
      */
     protected $auth = [];
 
@@ -1126,7 +1020,6 @@ class SSH2
      * Terminal
      *
      * @var string
-     * @access private
      */
     private $term = 'vt100';
 
@@ -1135,7 +1028,6 @@ class SSH2
      *
      * @see https://tools.ietf.org/html/rfc4252#section-5.1
      * @var array|null
-     * @access private
      */
     private $auth_methods_to_continue = null;
 
@@ -1143,7 +1035,6 @@ class SSH2
      * Compression method
      *
      * @var int
-     * @access private
      */
     private $compress = self::NET_SSH2_COMPRESSION_NONE;
 
@@ -1151,7 +1042,6 @@ class SSH2
      * Decompression method
      *
      * @var int
-     * @access private
      */
     private $decompress = self::NET_SSH2_COMPRESSION_NONE;
 
@@ -1159,7 +1049,6 @@ class SSH2
      * Compression context
      *
      * @var resource|false|null
-     * @access private
      */
     private $compress_context;
 
@@ -1167,7 +1056,6 @@ class SSH2
      * Decompression context
      *
      * @var resource|object
-     * @access private
      */
     private $decompress_context;
 
@@ -1175,7 +1063,6 @@ class SSH2
      * Regenerate Compression Context
      *
      * @var bool
-     * @access private
      */
     private $regenerate_compression_context = false;
 
@@ -1183,7 +1070,6 @@ class SSH2
      * Regenerate Decompression Context
      *
      * @var bool
-     * @access private
      */
     private $regenerate_decompression_context = false;
 
@@ -1191,7 +1077,6 @@ class SSH2
      * Smart multi-factor authentication flag
      *
      * @var bool
-     * @access private
      */
     private $smartMFA = true;
 
@@ -1204,7 +1089,6 @@ class SSH2
      * @param int $port
      * @param int $timeout
      * @see self::login()
-     * @access public
      */
     public function __construct($host, $port = 22, $timeout = 10)
     {
@@ -1314,7 +1198,6 @@ class SSH2
      * OpenSSL, mcrypt, Eval, PHP
      *
      * @param int $engine
-     * @access public
      */
     public static function setCryptoEngine($engine)
     {
@@ -1328,7 +1211,6 @@ class SSH2
      * both sides MUST send an identification string". It does not say which side sends it first. In
      * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
      *
-     * @access public
      */
     public function sendIdentificationStringFirst()
     {
@@ -1342,7 +1224,6 @@ class SSH2
      * both sides MUST send an identification string". It does not say which side sends it first. In
      * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
      *
-     * @access public
      */
     public function sendIdentificationStringLast()
     {
@@ -1356,7 +1237,6 @@ class SSH2
      * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
      * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
      *
-     * @access public
      */
     public function sendKEXINITFirst()
     {
@@ -1370,7 +1250,6 @@ class SSH2
      * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
      * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
      *
-     * @access public
      */
     public function sendKEXINITLast()
     {
@@ -1382,7 +1261,6 @@ class SSH2
      *
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \RuntimeException on other errors
-     * @access private
      */
     private function connect()
     {
@@ -1526,7 +1404,6 @@ class SSH2
      *
      * You should overwrite this method in your own class if you want to use another identifier
      *
-     * @access protected
      * @return string
      */
     private function generate_identifier()
@@ -1565,7 +1442,6 @@ class SSH2
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \RuntimeException on other errors
      * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
-     * @access private
      */
     private function key_exchange($kexinit_payload_server = false)
     {
@@ -2081,7 +1957,6 @@ class SSH2
      *
      * @param string $algorithm Name of the encryption algorithm
      * @return int|null Number of bytes as an integer or null for unknown
-     * @access private
      */
     private function encryption_algorithm_to_key_size($algorithm)
     {
@@ -2129,7 +2004,6 @@ class SSH2
      *
      * @param string $algorithm Name of the encryption algorithm
      * @return SymmetricKey|null
-     * @access private
      */
     private static function encryption_algorithm_to_crypt_instance($algorithm)
     {
@@ -2178,7 +2052,6 @@ class SSH2
      *
      * @param string $algorithm Name of the encryption algorithm
      * @return array{Hash, int}|null
-     * @access private
      */
     private static function mac_algorithm_to_hash_instance($algorithm)
     {
@@ -2214,7 +2087,6 @@ class SSH2
      * @link https://bugzilla.mindrot.org/show_bug.cgi?id=1291
      * @param string $algorithm Name of the encryption algorithm
      * @return bool
-     * @access private
      */
     private static function bad_algorithm_candidate($algorithm)
     {
@@ -2237,7 +2109,6 @@ class SSH2
      * @param string|AsymmetricKey|array[]|Agent|null ...$args
      * @return bool
      * @see self::_login()
-     * @access public
      */
     public function login($username, ...$args)
     {
@@ -2263,7 +2134,6 @@ class SSH2
      * @param string ...$args
      * @return bool
      * @see self::_login_helper()
-     * @access private
      */
     protected function sublogin($username, ...$args)
     {
@@ -2361,7 +2231,6 @@ class SSH2
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \RuntimeException on other errors
-     * @access private
      */
     private function login_helper($username, $password = null)
     {
@@ -2509,7 +2378,6 @@ class SSH2
      * @param string $username
      * @param string|array $password
      * @return bool
-     * @access private
      */
     private function keyboard_interactive_login($username, $password)
     {
@@ -2533,7 +2401,6 @@ class SSH2
      * @param string|array ...$responses
      * @return bool
      * @throws \RuntimeException on connection error
-     * @access private
      */
     private function keyboard_interactive_process(...$responses)
     {
@@ -2630,7 +2497,6 @@ class SSH2
      * @param string $username
      * @param \phpseclib3\System\SSH\Agent $agent
      * @return bool
-     * @access private
      */
     private function ssh_agent_login($username, Agent $agent)
     {
@@ -2655,7 +2521,6 @@ class SSH2
      * @param \phpseclib3\Crypt\Common\PrivateKey $privatekey
      * @return bool
      * @throws \RuntimeException on connection error
-     * @access private
      */
     private function privatekey_login($username, PrivateKey $privatekey)
     {
@@ -2787,7 +2652,6 @@ class SSH2
      * Setting $timeout to false or 0 will mean there is no timeout.
      *
      * @param mixed $timeout
-     * @access public
      */
     public function setTimeout($timeout)
     {
@@ -2800,7 +2664,6 @@ class SSH2
      * Sends an SSH2_MSG_IGNORE message every x seconds, if x is a positive non-zero number.
      *
      * @param int $interval
-     * @access public
      */
     public function setKeepAlive($interval)
     {
@@ -2810,7 +2673,6 @@ class SSH2
     /**
      * Get the output from stdError
      *
-     * @access public
      */
     public function getStdError()
     {
@@ -2827,7 +2689,6 @@ class SSH2
      * @return string|bool
      * @psalm-return ($callback is callable ? bool : string|bool)
      * @throws \RuntimeException on connection error
-     * @access public
      */
     public function exec($command, callable $callback = null)
     {
@@ -2953,7 +2814,6 @@ class SSH2
      * @return bool
      * @throws \UnexpectedValueException on receipt of unexpected packets
      * @throws \RuntimeException on other errors
-     * @access private
      */
     private function initShell()
     {
@@ -3029,7 +2889,6 @@ class SSH2
      * @see self::read()
      * @see self::write()
      * @return int
-     * @access public
      */
     private function get_interactive_channel()
     {
@@ -3047,7 +2906,6 @@ class SSH2
      * Return an available open channel
      *
      * @return int
-     * @access public
      */
     private function get_open_channel()
     {
@@ -3065,7 +2923,6 @@ class SSH2
      * Request agent forwarding of remote server
      *
      * @return bool
-     * @access public
      */
     public function requestAgentForwarding()
     {
@@ -3106,7 +2963,6 @@ class SSH2
      * @param int $mode
      * @return string|bool|null
      * @throws \RuntimeException on connection error
-     * @access public
      */
     public function read($expect = '', $mode = self::READ_SIMPLE)
     {
@@ -3180,7 +3036,6 @@ class SSH2
      * @see self::stopSubsystem()
      * @param string $subsystem
      * @return bool
-     * @access public
      */
     public function startSubsystem($subsystem)
     {
@@ -3230,7 +3085,6 @@ class SSH2
      *
      * @see self::startSubsystem()
      * @return bool
-     * @access public
      */
     public function stopSubsystem()
     {
@@ -3244,7 +3098,6 @@ class SSH2
      *
      * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
      *
-     * @access public
      */
     public function reset()
     {
@@ -3256,7 +3109,6 @@ class SSH2
      *
      * Did exec() or read() return because they timed out or because they encountered the end?
      *
-     * @access public
      */
     public function isTimeout()
     {
@@ -3266,7 +3118,6 @@ class SSH2
     /**
      * Disconnect
      *
-     * @access public
      */
     public function disconnect()
     {
@@ -3283,7 +3134,6 @@ class SSH2
      * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
      * disconnect().
      *
-     * @access public
      */
     public function __destruct()
     {
@@ -3294,7 +3144,6 @@ class SSH2
      * Is the connection still active?
      *
      * @return bool
-     * @access public
      */
     public function isConnected()
     {
@@ -3305,7 +3154,6 @@ class SSH2
      * Have you successfully been logged in?
      *
      * @return bool
-     * @access public
      */
     public function isAuthenticated()
     {
@@ -3373,7 +3221,6 @@ class SSH2
      * Resets a connection for re-use
      *
      * @param int $reason
-     * @access private
      */
     protected function reset_connection($reason)
     {
@@ -3395,7 +3242,6 @@ class SSH2
      * @see self::_send_binary_packet()
      * @param bool $skip_channel_filter
      * @return bool|string
-     * @access private
      */
     private function get_binary_packet($skip_channel_filter = false)
     {
@@ -3641,7 +3487,6 @@ class SSH2
      * @see self::get_binary_packet()
      * @param int $remaining_length
      * @return string
-     * @access private
      */
     private function read_remaining_bytes($remaining_length)
     {
@@ -3701,7 +3546,6 @@ class SSH2
      * @param string $payload
      * @param bool $skip_channel_filter
      * @return string|bool
-     * @access private
      */
     private function filter($payload, $skip_channel_filter)
     {
@@ -3852,7 +3696,6 @@ class SSH2
      *
      * Suppress stderr from output
      *
-     * @access public
      */
     public function enableQuietMode()
     {
@@ -3864,7 +3707,6 @@ class SSH2
      *
      * Show stderr in output
      *
-     * @access public
      */
     public function disableQuietMode()
     {
@@ -3876,7 +3718,6 @@ class SSH2
      *
      * @see self::enableQuietMode()
      * @see self::disableQuietMode()
-     * @access public
      * @return bool
      */
     public function isQuietModeEnabled()
@@ -3887,7 +3728,6 @@ class SSH2
     /**
      * Enable request-pty when using exec()
      *
-     * @access public
      */
     public function enablePTY()
     {
@@ -3897,7 +3737,6 @@ class SSH2
     /**
      * Disable request-pty when using exec()
      *
-     * @access public
      */
     public function disablePTY()
     {
@@ -3913,7 +3752,6 @@ class SSH2
      *
      * @see self::enablePTY()
      * @see self::disablePTY()
-     * @access public
      * @return bool
      */
     public function isPTYEnabled()
@@ -3939,7 +3777,6 @@ class SSH2
      * @param bool $skip_extended
      * @return mixed
      * @throws \RuntimeException on connection error
-     * @access private
      */
     protected function get_channel_packet($client_channel, $skip_extended = false)
     {
@@ -4163,7 +4000,6 @@ class SSH2
      * @param string $logged
      * @see self::_get_binary_packet()
      * @return void
-     * @access private
      */
     protected function send_binary_packet($data, $logged = null)
     {
@@ -4308,7 +4144,6 @@ class SSH2
      *
      * @param string $message_number
      * @param string $message
-     * @access private
      */
     private function append_log($message_number, $message)
     {
@@ -4428,7 +4263,6 @@ class SSH2
      * @param int $client_channel
      * @param bool $want_reply
      * @return void
-     * @access private
      */
     private function close_channel($client_channel, $want_reply = false)
     {
@@ -4465,7 +4299,6 @@ class SSH2
      *
      * @param int $reason
      * @return false
-     * @access protected
      */
     protected function disconnect_helper($reason)
     {
@@ -4513,7 +4346,6 @@ class SSH2
      *
      * Returns a string if NET_SSH2_LOGGING == self::LOG_COMPLEX, an array if NET_SSH2_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
      *
-     * @access public
      * @return array|false|string
      */
     public function getLog()
@@ -4538,7 +4370,6 @@ class SSH2
      *
      * @param array $message_log
      * @param array $message_number_log
-     * @access private
      * @return string
      */
     protected function format_log($message_log, $message_number_log)
@@ -4576,7 +4407,6 @@ class SSH2
      * of said channel opening. Must be called after
      * channel open confirmation received
      *
-     * @access private
      */
     private function on_channel_open()
     {
@@ -4592,7 +4422,6 @@ class SSH2
      * @param array $array1
      * @param array $array2
      * @return mixed False if intersection is empty, else intersected value.
-     * @access private
      */
     private static function array_intersect_first($array1, $array2)
     {
@@ -4608,7 +4437,6 @@ class SSH2
      * Returns all errors
      *
      * @return string[]
-     * @access public
      */
     public function getErrors()
     {
@@ -4619,7 +4447,6 @@ class SSH2
      * Returns the last error
      *
      * @return string
-     * @access public
      */
     public function getLastError()
     {
@@ -4634,7 +4461,6 @@ class SSH2
      * Return the server identification.
      *
      * @return string|false
-     * @access public
      */
     public function getServerIdentification()
     {
@@ -4647,7 +4473,6 @@ class SSH2
      * Returns a list of algorithms the server supports
      *
      * @return array
-     * @access public
      */
     public function getServerAlgorithms()
     {
@@ -4675,7 +4500,6 @@ class SSH2
      * Returns a list of KEX algorithms that phpseclib supports
      *
      * @return array
-     * @access public
      */
     public static function getSupportedKEXAlgorithms()
     {
@@ -4712,7 +4536,6 @@ class SSH2
      * Returns a list of host key algorithms that phpseclib supports
      *
      * @return array
-     * @access public
      */
     public static function getSupportedHostKeyAlgorithms()
     {
@@ -4732,7 +4555,6 @@ class SSH2
      * Returns a list of symmetric key algorithms that phpseclib supports
      *
      * @return array
-     * @access public
      */
     public static function getSupportedEncryptionAlgorithms()
     {
@@ -4837,7 +4659,6 @@ class SSH2
      * Returns a list of MAC algorithms that phpseclib supports
      *
      * @return array
-     * @access public
      */
     public static function getSupportedMACAlgorithms()
     {
@@ -4868,7 +4689,6 @@ class SSH2
      * Returns a list of compression algorithms that phpseclib supports
      *
      * @return array
-     * @access public
      */
     public static function getSupportedCompressionAlgorithms()
     {
@@ -4886,7 +4706,6 @@ class SSH2
      * Uses the same format as https://www.php.net/ssh2-methods-negotiated
      *
      * @return array
-     * @access public
      */
     public function getAlgorithmsNegotiated()
     {
@@ -4918,7 +4737,6 @@ class SSH2
      * Allows you to set the terminal
      *
      * @param string $term
-     * @access public
      */
     public function setTerminal($term)
     {
@@ -4930,7 +4748,6 @@ class SSH2
      * <https://www.php.net/manual/en/function.ssh2-connect.php>
      *
      * @param array $methods
-     * @access public
      */
     public function setPreferredAlgorithms(array $methods)
     {
@@ -5017,7 +4834,6 @@ class SSH2
      * authentication may be relevant for getting legal protection."
      *
      * @return string
-     * @access public
      */
     public function getBannerMessage()
     {
@@ -5033,7 +4849,6 @@ class SSH2
      * @return string|false
      * @throws \RuntimeException on badly formatted keys
      * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when the key isn't in a supported format
-     * @access public
      */
     public function getServerPublicHostKey()
     {
@@ -5118,7 +4933,6 @@ class SSH2
      * Returns the exit status of an SSH command or false.
      *
      * @return false|int
-     * @access public
      */
     public function getExitStatus()
     {
@@ -5132,7 +4946,6 @@ class SSH2
      * Returns the number of columns for the terminal window size.
      *
      * @return int
-     * @access public
      */
     public function getWindowColumns()
     {
@@ -5143,7 +4956,6 @@ class SSH2
      * Returns the number of rows for the terminal window size.
      *
      * @return int
-     * @access public
      */
     public function getWindowRows()
     {
@@ -5154,7 +4966,6 @@ class SSH2
      * Sets the number of columns for the terminal window size.
      *
      * @param int $value
-     * @access public
      */
     public function setWindowColumns($value)
     {
@@ -5165,7 +4976,6 @@ class SSH2
      * Sets the number of rows for the terminal window size.
      *
      * @param int $value
-     * @access public
      */
     public function setWindowRows($value)
     {
@@ -5177,7 +4987,6 @@ class SSH2
      *
      * @param int $columns
      * @param int $rows
-     * @access public
      */
     public function setWindowSize($columns = 80, $rows = 24)
     {
@@ -5189,7 +4998,6 @@ class SSH2
      * To String Magic Method
      *
      * @return string
-     * @access public
      */
     #[\ReturnTypeWillChange]
     public function __toString()
@@ -5250,7 +5058,6 @@ class SSH2
      *
      * @param string $old
      * @param string $new
-     * @access private
      */
     private function updateLogHistory($old, $new)
     {
diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php
index 8b412f0f..d7d1a00c 100644
--- a/phpseclib/System/SSH/Agent.php
+++ b/phpseclib/System/SSH/Agent.php
@@ -24,8 +24,6 @@
  * ?>
  * </code>
  *
- * @category  System
- * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -45,9 +43,7 @@ use phpseclib3\System\SSH\Agent\Identity;
  *
  * requestIdentities() method pumps out \phpseclib3\System\SSH\Agent\Identity objects
  *
- * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 class Agent
 {
@@ -82,7 +78,6 @@ class Agent
      * Socket Resource
      *
      * @var resource
-     * @access private
      */
     private $fsock;
 
@@ -90,7 +85,6 @@ class Agent
      * Agent forwarding status
      *
      * @var int
-     * @access private
      */
     private $forward_status = self::FORWARD_NONE;
 
@@ -100,7 +94,6 @@ class Agent
      * for agent unix socket
      *
      * @var string
-     * @access private
      */
     private $socket_buffer = '';
 
@@ -110,7 +103,6 @@ class Agent
      * channel
      *
      * @var int
-     * @access private
      */
     private $expected_bytes = 0;
 
@@ -118,7 +110,6 @@ class Agent
      * The current request channel
      *
      * @var int
-     * @access private
      */
     private $request_channel;
 
@@ -128,7 +119,6 @@ class Agent
      * @return \phpseclib3\System\SSH\Agent
      * @throws \phpseclib3\Exception\BadConfigurationException if SSH_AUTH_SOCK cannot be found
      * @throws \RuntimeException on connection errors
-     * @access public
      */
     public function __construct($address = null)
     {
@@ -159,7 +149,6 @@ class Agent
      *
      * @return array
      * @throws \RuntimeException on receipt of unexpected packets
-     * @access public
      */
     public function requestIdentities()
     {
@@ -212,7 +201,6 @@ class Agent
      * be requested when a channel is opened
      *
      * @return void
-     * @access public
      */
     public function startSSHForwarding()
     {
@@ -226,7 +214,6 @@ class Agent
      *
      * @param \phpseclib3\Net\SSH2 $ssh
      * @return bool
-     * @access private
      */
     private function request_forwarding($ssh)
     {
@@ -247,7 +234,6 @@ class Agent
      * to take further action. i.e. request agent forwarding
      *
      * @param \phpseclib3\Net\SSH2 $ssh
-     * @access private
      */
     public function registerChannelOpen($ssh)
     {
@@ -262,7 +248,6 @@ class Agent
      * @param string $data
      * @return string Data from SSH Agent
      * @throws \RuntimeException on connection errors
-     * @access public
      */
     public function forwardData($data)
     {
diff --git a/phpseclib/System/SSH/Agent/Identity.php b/phpseclib/System/SSH/Agent/Identity.php
index f052b612..a7979f06 100644
--- a/phpseclib/System/SSH/Agent/Identity.php
+++ b/phpseclib/System/SSH/Agent/Identity.php
@@ -7,8 +7,6 @@
  *
  * PHP version 5
  *
- * @category  System
- * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -25,6 +23,7 @@ use phpseclib3\Crypt\EC;
 use phpseclib3\Crypt\RSA;
 use phpseclib3\Exception\UnsupportedAlgorithmException;
 use phpseclib3\System\SSH\Agent;
+use phpseclib3\System\SSH\Common\Traits\ReadBytes;
 
 /**
  * Pure-PHP ssh-agent client identity object
@@ -35,13 +34,12 @@ use phpseclib3\System\SSH\Agent;
  * The methods in this interface would be getPublicKey and sign since those are the
  * methods phpseclib looks for to perform public key authentication.
  *
- * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  internal
+ * @internal
  */
 class Identity implements PrivateKey
 {
-    use \phpseclib3\System\SSH\Common\Traits\ReadBytes;
+    use ReadBytes;
 
     // Signature Flags
     // See https://tools.ietf.org/html/draft-miller-ssh-agent-00#section-5.3
@@ -52,7 +50,6 @@ class Identity implements PrivateKey
      * Key Object
      *
      * @var PublicKey
-     * @access private
      * @see self::getPublicKey()
      */
     private $key;
@@ -61,7 +58,6 @@ class Identity implements PrivateKey
      * Key Blob
      *
      * @var string
-     * @access private
      * @see self::sign()
      */
     private $key_blob;
@@ -70,7 +66,6 @@ class Identity implements PrivateKey
      * Socket Resource
      *
      * @var resource
-     * @access private
      * @see self::sign()
      */
     private $fsock;
@@ -79,7 +74,6 @@ class Identity implements PrivateKey
      * Signature flags
      *
      * @var int
-     * @access private
      * @see self::sign()
      * @see self::setHash()
      */
@@ -89,7 +83,6 @@ class Identity implements PrivateKey
      * Curve Aliases
      *
      * @var array
-     * @access private
      */
     private static $curveAliases = [
         'secp256r1' => 'nistp256',
@@ -102,7 +95,6 @@ class Identity implements PrivateKey
      * Default Constructor.
      *
      * @param resource $fsock
-     * @access private
      */
     public function __construct($fsock)
     {
@@ -115,7 +107,6 @@ class Identity implements PrivateKey
      * Called by \phpseclib3\System\SSH\Agent::requestIdentities()
      *
      * @param \phpseclib3\Crypt\Common\PublicKey $key
-     * @access private
      */
     public function withPublicKey($key)
     {
@@ -137,7 +128,6 @@ class Identity implements PrivateKey
      * but this saves a small amount of computation.
      *
      * @param string $key_blob
-     * @access private
      */
     public function withPublicKeyBlob($key_blob)
     {
@@ -153,7 +143,6 @@ class Identity implements PrivateKey
      *
      * @param string $type optional
      * @return mixed
-     * @access public
      */
     public function getPublicKey($type = 'PKCS8')
     {
@@ -164,7 +153,6 @@ class Identity implements PrivateKey
      * Sets the hash
      *
      * @param string $hash
-     * @access public
      */
     public function withHash($hash)
     {
@@ -218,7 +206,6 @@ class Identity implements PrivateKey
      * Only PKCS1 padding is supported
      *
      * @param string $padding
-     * @access public
      */
     public function withPadding($padding)
     {
@@ -236,7 +223,6 @@ class Identity implements PrivateKey
      *
      * Valid values are: ASN1, SSH2, Raw
      *
-     * @access public
      * @param string $format
      */
     public function withSignatureFormat($format)
@@ -256,7 +242,6 @@ class Identity implements PrivateKey
      *
      * Returns a string if it's a named curve, an array if not
      *
-     * @access public
      * @return string|array
      */
     public function getCurve()
@@ -277,7 +262,6 @@ class Identity implements PrivateKey
      * @return string
      * @throws \RuntimeException on connection errors
      * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
-     * @access public
      */
     public function sign($message)
     {
@@ -326,7 +310,6 @@ class Identity implements PrivateKey
     /**
      * Sets the password
      *
-     * @access public
      * @param string|bool $password
      * @return never
      */
diff --git a/phpseclib/System/SSH/Common/Traits/ReadBytes.php b/phpseclib/System/SSH/Common/Traits/ReadBytes.php
index 297808e4..6fd032bd 100644
--- a/phpseclib/System/SSH/Common/Traits/ReadBytes.php
+++ b/phpseclib/System/SSH/Common/Traits/ReadBytes.php
@@ -5,8 +5,6 @@
  *
  * PHP version 5
  *
- * @category  System
- * @package   SSH
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2015 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
@@ -18,9 +16,7 @@ namespace phpseclib3\System\SSH\Common\Traits;
 /**
  * ReadBytes trait
  *
- * @package SSH
  * @author  Jim Wigginton <terrafrost@php.net>
- * @access  public
  */
 trait ReadBytes
 {
@@ -29,7 +25,6 @@ trait ReadBytes
      *
      * @param int $length
      * @throws \RuntimeException on connection errors
-     * @access public
      */
     public function readBytes($length)
     {