diff --git a/src/Attribute.php b/src/Attribute.php
index 4a51a778f..063b98047 100644
--- a/src/Attribute.php
+++ b/src/Attribute.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
@@ -14,9 +13,6 @@
 
 /**
  * Zend\Ldap\Attribute is a collection of LDAP attribute related functions.
- *
- * @category   Zend
- * @package    Zend_Ldap
  */
 class Attribute
 {
diff --git a/src/Collection.php b/src/Collection.php
index 023fabe0c..22a6bfad3 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
 
 /**
  * Zend\Ldap\Collection wraps a list of LDAP entries.
- *
- * @category   Zend
- * @package    Zend_Ldap
  */
 class Collection implements \Iterator, \Countable
 {
diff --git a/src/Collection/DefaultIterator.php b/src/Collection/DefaultIterator.php
index 1c2895eb2..e0dbf886c 100644
--- a/src/Collection/DefaultIterator.php
+++ b/src/Collection/DefaultIterator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Collection;
@@ -17,9 +16,6 @@
 /**
  * Zend\Ldap\Collection\DefaultIterator is the default collection iterator implementation
  * using ext/ldap
- *
- * @category   Zend
- * @package    Zend_Ldap
  */
 class DefaultIterator implements \Iterator, \Countable
 {
diff --git a/src/Converter/Converter.php b/src/Converter/Converter.php
index 6e6a37147..bbad0fb0f 100644
--- a/src/Converter/Converter.php
+++ b/src/Converter/Converter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Converter;
@@ -16,9 +15,6 @@
 
 /**
  * Zend\Ldap\Converter is a collection of useful LDAP related conversion functions.
- *
- * @category  Zend
- * @package   Zend_Ldap
  */
 class Converter
 {
@@ -64,7 +60,9 @@ public static function ascToHex32($string)
      */
     public static function hex32ToAsc($string)
     {
-        $string = preg_replace('/\\\([0-9A-Fa-f]{2})/e', "''.chr(hexdec('\\1')).''", $string);
+        $string = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', function ($matches) {
+            return chr(hexdec($matches[1]));
+        }, $string);
         return $string;
     }
 
diff --git a/src/Converter/Exception/ConverterException.php b/src/Converter/Exception/ConverterException.php
index e819ba92b..868abbc2e 100644
--- a/src/Converter/Exception/ConverterException.php
+++ b/src/Converter/Exception/ConverterException.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Converter\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class ConverterException extends \Exception implements ExceptionInterface
 {
 }
diff --git a/src/Converter/Exception/ExceptionInterface.php b/src/Converter/Exception/ExceptionInterface.php
index e5a74a300..980b84628 100644
--- a/src/Converter/Exception/ExceptionInterface.php
+++ b/src/Converter/Exception/ExceptionInterface.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Converter\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 interface ExceptionInterface
 {
 }
diff --git a/src/Converter/Exception/InvalidArgumentException.php b/src/Converter/Exception/InvalidArgumentException.php
index a6046dcd0..150a877d6 100644
--- a/src/Converter/Exception/InvalidArgumentException.php
+++ b/src/Converter/Exception/InvalidArgumentException.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Converter\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/src/Converter/Exception/UnexpectedValueException.php b/src/Converter/Exception/UnexpectedValueException.php
index 318e1d261..01ae20cf1 100644
--- a/src/Converter/Exception/UnexpectedValueException.php
+++ b/src/Converter/Exception/UnexpectedValueException.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Converter\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class UnexpectedValueException extends \UnexpectedValueException implements ExceptionInterface
 {
 }
diff --git a/src/Dn.php b/src/Dn.php
index 75c03ea0e..81f29fec7 100644
--- a/src/Dn.php
+++ b/src/Dn.php
@@ -5,16 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
 
 /**
  * Zend\Ldap\Dn provides an API for DN manipulation
- *
- * @category   Zend
- * @package    Zend_Ldap
  */
 class Dn implements \ArrayAccess
 {
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
index 3aff5ee13..caf0d5111 100644
--- a/src/Exception/BadMethodCallException.php
+++ b/src/Exception/BadMethodCallException.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 880752612..457fe1b77 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 interface ExceptionInterface
 {
 }
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 0511aca51..4d6cf6577 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/src/Exception/LdapException.php b/src/Exception/LdapException.php
index 8b19dc5bb..ee36329b1 100644
--- a/src/Exception/LdapException.php
+++ b/src/Exception/LdapException.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Exception;
 
 use Zend\Ldap\Ldap;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class LdapException extends \Exception implements ExceptionInterface
 {
     const LDAP_SUCCESS                        = 0x00;
diff --git a/src/Filter.php b/src/Filter.php
index 09712afdf..e074e5397 100644
--- a/src/Filter.php
+++ b/src/Filter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
 
 /**
  * Zend\Ldap\Filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class Filter extends Filter\StringFilter
 {
diff --git a/src/Filter/AbstractFilter.php b/src/Filter/AbstractFilter.php
index 7f6c84fb7..c64108263 100644
--- a/src/Filter/AbstractFilter.php
+++ b/src/Filter/AbstractFilter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Filter\AbstractFilter provides a base implementation for filters.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 abstract class AbstractFilter
 {
diff --git a/src/Filter/AbstractLogicalFilter.php b/src/Filter/AbstractLogicalFilter.php
index b3920af3d..c353e0de2 100644
--- a/src/Filter/AbstractLogicalFilter.php
+++ b/src/Filter/AbstractLogicalFilter.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Filter\AbstractLogicalFilter provides a base implementation for a grouping filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 abstract class AbstractLogicalFilter extends AbstractFilter
 {
diff --git a/src/Filter/AndFilter.php b/src/Filter/AndFilter.php
index 25281a0c9..b444b6e29 100644
--- a/src/Filter/AndFilter.php
+++ b/src/Filter/AndFilter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
 
 /**
  * Zend\Ldap\Filter\AndFilter provides an 'and' filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class AndFilter extends AbstractLogicalFilter
 {
diff --git a/src/Filter/Exception/ExceptionInterface.php b/src/Filter/Exception/ExceptionInterface.php
index 2ccc86617..4d9bce6cc 100644
--- a/src/Filter/Exception/ExceptionInterface.php
+++ b/src/Filter/Exception/ExceptionInterface.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter\Exception;
 
 use Zend\Ldap\Exception\ExceptionInterface as MainLdapException;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 interface ExceptionInterface extends MainLdapException
 {
 }
diff --git a/src/Filter/Exception/FilterException.php b/src/Filter/Exception/FilterException.php
index cf10b4a2b..b7fb1cbaf 100644
--- a/src/Filter/Exception/FilterException.php
+++ b/src/Filter/Exception/FilterException.php
@@ -5,16 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter\Exception;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
- */
 class FilterException extends \Exception implements ExceptionInterface
 {
 }
diff --git a/src/Filter/MaskFilter.php b/src/Filter/MaskFilter.php
index f0cbb7d86..844149b3f 100644
--- a/src/Filter/MaskFilter.php
+++ b/src/Filter/MaskFilter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
 
 /**
  * Zend\Ldap\Filter\MaskFilter provides a simple string filter to be used with a mask.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class MaskFilter extends StringFilter
 {
diff --git a/src/Filter/NotFilter.php b/src/Filter/NotFilter.php
index 7d1e822fe..a03bd73e9 100644
--- a/src/Filter/NotFilter.php
+++ b/src/Filter/NotFilter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
 
 /**
  * Zend\Ldap\Filter\NotFilter provides a negation filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class NotFilter extends AbstractFilter
 {
diff --git a/src/Filter/OrFilter.php b/src/Filter/OrFilter.php
index dff5d5d6d..c349ddd4e 100644
--- a/src/Filter/OrFilter.php
+++ b/src/Filter/OrFilter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
 
 /**
  * Zend\Ldap\Filter\OrFilter provides an 'or' filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class OrFilter extends AbstractLogicalFilter
 {
diff --git a/src/Filter/StringFilter.php b/src/Filter/StringFilter.php
index e153abe0a..c939b23fd 100644
--- a/src/Filter/StringFilter.php
+++ b/src/Filter/StringFilter.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Filter;
 
 /**
  * Zend\Ldap\Filter\StringFilter provides a simple custom string filter.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Filter
  */
 class StringFilter extends AbstractFilter
 {
diff --git a/src/Ldap.php b/src/Ldap.php
index a1c6c00c6..74c73338e 100644
--- a/src/Ldap.php
+++ b/src/Ldap.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
@@ -13,10 +12,6 @@
 use Traversable;
 use Zend\Stdlib\ErrorHandler;
 
-/**
- * @category   Zend
- * @package    Zend_Ldap
- */
 class Ldap
 {
     const SEARCH_SCOPE_SUB  = 1;
diff --git a/src/Ldif/Encoder.php b/src/Ldif/Encoder.php
index 868037229..d484a91b3 100644
--- a/src/Ldif/Encoder.php
+++ b/src/Ldif/Encoder.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Ldif;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Ldif\Encoder provides methods to encode and decode LDAP data into/from Ldif.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Ldif
  */
 class Encoder
 {
diff --git a/src/Node.php b/src/Node.php
index bfdb15f7f..e351cdd92 100644
--- a/src/Node.php
+++ b/src/Node.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Node provides an object oriented view into a LDAP node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
  */
 class Node extends Node\AbstractNode implements \Iterator, \RecursiveIterator
 {
diff --git a/src/Node/AbstractNode.php b/src/Node/AbstractNode.php
index f86c400c8..2581b491d 100644
--- a/src/Node/AbstractNode.php
+++ b/src/Node/AbstractNode.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node;
@@ -15,10 +14,6 @@
 
 /**
  * This class provides a base implementation for LDAP nodes
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
  */
 abstract class AbstractNode implements \ArrayAccess, \Countable
 {
diff --git a/src/Node/ChildrenIterator.php b/src/Node/ChildrenIterator.php
index 0ea5d9609..2674d9d1a 100644
--- a/src/Node/ChildrenIterator.php
+++ b/src/Node/ChildrenIterator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Node\ChildrenIterator provides an iterator to a collection of children nodes.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
  */
 class ChildrenIterator implements \Iterator, \Countable, \RecursiveIterator, \ArrayAccess
 {
diff --git a/src/Node/Collection.php b/src/Node/Collection.php
index f1449acd1..f46eabbc0 100644
--- a/src/Node/Collection.php
+++ b/src/Node/Collection.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Node\Collection provides a collection of nodes.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Node
  */
 class Collection extends Ldap\Collection
 {
diff --git a/src/Node/RootDse.php b/src/Node/RootDse.php
index 19cd66946..94a55d214 100644
--- a/src/Node/RootDse.php
+++ b/src/Node/RootDse.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Node\RootDse provides a simple data-container for the RootDse node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDse
  */
 class RootDse extends AbstractNode
 {
diff --git a/src/Node/RootDse/ActiveDirectory.php b/src/Node/RootDse/ActiveDirectory.php
index bb2834499..a536a2c0a 100644
--- a/src/Node/RootDse/ActiveDirectory.php
+++ b/src/Node/RootDse/ActiveDirectory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -16,10 +15,6 @@
 /**
  * Zend\Ldap\Node\RootDse\ActiveDirectory provides a simple data-container for
  * the RootDse node of an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDse
  */
 class ActiveDirectory extends Node\RootDse
 {
diff --git a/src/Node/RootDse/OpenLdap.php b/src/Node/RootDse/OpenLdap.php
index dd19f07bd..56fcd95bc 100644
--- a/src/Node/RootDse/OpenLdap.php
+++ b/src/Node/RootDse/OpenLdap.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\RootDse\OpenLdap provides a simple data-container for the
  * RootDse node of an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDse
  */
 class OpenLdap extends Node\RootDse
 {
diff --git a/src/Node/RootDse/eDirectory.php b/src/Node/RootDse/eDirectory.php
index 7da16e85f..6842265db 100644
--- a/src/Node/RootDse/eDirectory.php
+++ b/src/Node/RootDse/eDirectory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\RootDse;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\RootDse\eDirectory provides a simple data-container for the
  * RootDse node of a Novell eDirectory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage RootDse
  */
 class eDirectory extends Node\RootDse
 {
diff --git a/src/Node/Schema.php b/src/Node/Schema.php
index c28a5cf98..2b447a1fe 100644
--- a/src/Node/Schema.php
+++ b/src/Node/Schema.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node;
@@ -14,10 +13,6 @@
 
 /**
  * Zend\Ldap\Node\Schema provides a simple data-container for the Schema node.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class Schema extends AbstractNode
 {
diff --git a/src/Node/Schema/AbstractItem.php b/src/Node/Schema/AbstractItem.php
index b25e78ee5..e1946e4fd 100644
--- a/src/Node/Schema/AbstractItem.php
+++ b/src/Node/Schema/AbstractItem.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -15,10 +14,6 @@
 /**
  * This class provides a base implementation for managing schema
  * items like objectClass and attributeType.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 abstract class AbstractItem implements \ArrayAccess, \Countable
 {
diff --git a/src/Node/Schema/ActiveDirectory.php b/src/Node/Schema/ActiveDirectory.php
index e1e653a89..222ea1ef0 100644
--- a/src/Node/Schema/ActiveDirectory.php
+++ b/src/Node/Schema/ActiveDirectory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -16,10 +15,6 @@
 /**
  * Zend\Ldap\Node\Schema\ActiveDirectory provides a simple data-container for the Schema node of
  * an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class ActiveDirectory extends Node\Schema
 {
diff --git a/src/Node/Schema/AttributeType/ActiveDirectory.php b/src/Node/Schema/AttributeType/ActiveDirectory.php
index a855274db..e35947405 100644
--- a/src/Node/Schema/AttributeType/ActiveDirectory.php
+++ b/src/Node/Schema/AttributeType/ActiveDirectory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\Schema\AttributeType\ActiveDirectory provides access to the attribute type
  * schema information on an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class ActiveDirectory extends Schema\AbstractItem implements AttributeTypeInterface
 {
diff --git a/src/Node/Schema/AttributeType/AttributeTypeInterface.php b/src/Node/Schema/AttributeType/AttributeTypeInterface.php
index b211215c7..18736e9d5 100644
--- a/src/Node/Schema/AttributeType/AttributeTypeInterface.php
+++ b/src/Node/Schema/AttributeType/AttributeTypeInterface.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
 
 /**
  * This class provides a contract for schema attribute-types.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 interface AttributeTypeInterface
 {
diff --git a/src/Node/Schema/AttributeType/OpenLdap.php b/src/Node/Schema/AttributeType/OpenLdap.php
index bcfafbbd1..c3bf7d2dd 100644
--- a/src/Node/Schema/AttributeType/OpenLdap.php
+++ b/src/Node/Schema/AttributeType/OpenLdap.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\AttributeType;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\Schema\AttributeType\OpenLdap provides access to the attribute type
  * schema information on an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class OpenLdap extends Schema\AbstractItem implements AttributeTypeInterface
 {
diff --git a/src/Node/Schema/ObjectClass/ActiveDirectory.php b/src/Node/Schema/ObjectClass/ActiveDirectory.php
index f4d26e106..687719661 100644
--- a/src/Node/Schema/ObjectClass/ActiveDirectory.php
+++ b/src/Node/Schema/ObjectClass/ActiveDirectory.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\Schema\ObjectClass\ActiveDirectory provides access to the objectClass
  * schema information on an Active Directory server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class ActiveDirectory extends Schema\AbstractItem implements ObjectClassInterface
 {
diff --git a/src/Node/Schema/ObjectClass/ObjectClassInterface.php b/src/Node/Schema/ObjectClass/ObjectClassInterface.php
index 72cf7bfa9..f23427e48 100644
--- a/src/Node/Schema/ObjectClass/ObjectClassInterface.php
+++ b/src/Node/Schema/ObjectClass/ObjectClassInterface.php
@@ -5,17 +5,12 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
 
 /**
  * This class provides a contract for schema objectClasses.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 interface ObjectClassInterface
 {
diff --git a/src/Node/Schema/ObjectClass/OpenLdap.php b/src/Node/Schema/ObjectClass/OpenLdap.php
index 8901a728e..5f5d5535d 100644
--- a/src/Node/Schema/ObjectClass/OpenLdap.php
+++ b/src/Node/Schema/ObjectClass/OpenLdap.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema\ObjectClass;
@@ -15,10 +14,6 @@
 /**
  * Zend\Ldap\Node\Schema\ObjectClass\OpenLdap provides access to the objectClass
  * schema information on an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class OpenLdap extends Schema\AbstractItem implements ObjectClassInterface
 {
diff --git a/src/Node/Schema/OpenLdap.php b/src/Node/Schema/OpenLdap.php
index 45dd74c40..7a183e616 100644
--- a/src/Node/Schema/OpenLdap.php
+++ b/src/Node/Schema/OpenLdap.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Ldap
  */
 
 namespace Zend\Ldap\Node\Schema;
@@ -17,10 +16,6 @@
 /**
  * Zend\Ldap\Node\Schema\OpenLDAP provides a simple data-container for the Schema node of
  * an OpenLDAP server.
- *
- * @category   Zend
- * @package    Zend_Ldap
- * @subpackage Schema
  */
 class OpenLdap extends Node\Schema
 {