diff --git a/src/ArrayStack.php b/src/ArrayStack.php
index d76cbc366..d4a0cc780 100644
--- a/src/ArrayStack.php
+++ b/src/ArrayStack.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use ArrayIterator,
diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php
index 3d4b86853..ddd2e4405 100644
--- a/src/CallbackHandler.php
+++ b/src/CallbackHandler.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Closure,
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
index 210a96e4c..8132a7a68 100644
--- a/src/Exception/BadMethodCallException.php
+++ b/src/Exception/BadMethodCallException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
 use Zend\Stdlib\Exception;
diff --git a/src/Exception/InvalidCallbackException.php b/src/Exception/InvalidCallbackException.php
index 92c19479f..d450529ae 100644
--- a/src/Exception/InvalidCallbackException.php
+++ b/src/Exception/InvalidCallbackException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
 use Zend\Stdlib\Exception;
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
index efb912a33..657519b4d 100644
--- a/src/Exception/LogicException.php
+++ b/src/Exception/LogicException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib\Exception;
 
 use Zend\Stdlib\Exception;
diff --git a/src/Options.php b/src/Options.php
index bbaacdb67..0a48f7962 100644
--- a/src/Options.php
+++ b/src/Options.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Traversable;
diff --git a/src/ParameterObject.php b/src/ParameterObject.php
index 80399282e..81ca1a60e 100644
--- a/src/ParameterObject.php
+++ b/src/ParameterObject.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 /**
diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
index 3a40e3634..c6c6531c2 100644
--- a/src/PriorityQueue.php
+++ b/src/PriorityQueue.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Countable,
diff --git a/src/SplPriorityQueue.php b/src/SplPriorityQueue.php
index 5752283de..cceef40c0 100644
--- a/src/SplPriorityQueue.php
+++ b/src/SplPriorityQueue.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Serializable;
diff --git a/src/SplQueue.php b/src/SplQueue.php
index 9b8d5118a..ef7d6a4b9 100644
--- a/src/SplQueue.php
+++ b/src/SplQueue.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Serializable;
diff --git a/src/SplStack.php b/src/SplStack.php
index 01aa0a0c3..b068a1da9 100644
--- a/src/SplStack.php
+++ b/src/SplStack.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Stdlib;
 
 use Serializable;
diff --git a/test/MessageTest.php b/test/MessageTest.php
index bf835a130..6060bb31d 100644
--- a/test/MessageTest.php
+++ b/test/MessageTest.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @namespace
- */
 namespace ZendTest\Http;
 
 use Zend\Stdlib\Message;