diff --git a/src/Client.php b/src/Client.php
index b531489e29..41a715f594 100755
--- a/src/Client.php
+++ b/src/Client.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http;
 
 use ArrayIterator,
diff --git a/src/Client/Adapter.php b/src/Client/Adapter.php
index 6a9d0e5373..40cd0957ba 100755
--- a/src/Client/Adapter.php
+++ b/src/Client/Adapter.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client;
 
 /**
diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
index 09d5aa9c03..7ce127434e 100755
--- a/src/Client/Adapter/Curl.php
+++ b/src/Client/Adapter/Curl.php
@@ -20,9 +20,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 use Zend\Http\Client\Adapter as HttpAdapter,
     Zend\Http\Client\Adapter\Exception as AdapterException,
diff --git a/src/Client/Adapter/Exception.php b/src/Client/Adapter/Exception.php
index 062b7e1ad5..3bd80faeb0 100755
--- a/src/Client/Adapter/Exception.php
+++ b/src/Client/Adapter/Exception.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 
 /**
diff --git a/src/Client/Adapter/Exception/InitializationException.php b/src/Client/Adapter/Exception/InitializationException.php
index cfe91114f1..e5d44f8c2a 100755
--- a/src/Client/Adapter/Exception/InitializationException.php
+++ b/src/Client/Adapter/Exception/InitializationException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
diff --git a/src/Client/Adapter/Exception/InvalidArgumentException.php b/src/Client/Adapter/Exception/InvalidArgumentException.php
index b0a90ac29d..fe15dc7776 100755
--- a/src/Client/Adapter/Exception/InvalidArgumentException.php
+++ b/src/Client/Adapter/Exception/InvalidArgumentException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
diff --git a/src/Client/Adapter/Exception/OutOfRangeException.php b/src/Client/Adapter/Exception/OutOfRangeException.php
index 1d350fb2d0..4e9129df9f 100755
--- a/src/Client/Adapter/Exception/OutOfRangeException.php
+++ b/src/Client/Adapter/Exception/OutOfRangeException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
diff --git a/src/Client/Adapter/Exception/RuntimeException.php b/src/Client/Adapter/Exception/RuntimeException.php
index a123a27d56..feb7409364 100755
--- a/src/Client/Adapter/Exception/RuntimeException.php
+++ b/src/Client/Adapter/Exception/RuntimeException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
diff --git a/src/Client/Adapter/Exception/TimeoutException.php b/src/Client/Adapter/Exception/TimeoutException.php
index 3e695de0b2..45fe9a7287 100755
--- a/src/Client/Adapter/Exception/TimeoutException.php
+++ b/src/Client/Adapter/Exception/TimeoutException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
index 4fa494b073..cfa5547395 100755
--- a/src/Client/Adapter/Proxy.php
+++ b/src/Client/Adapter/Proxy.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 use Zend\Http\Client,
     Zend\Http\Client\Adapter\Exception as AdapterException;
diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
index 67a9b23cd8..5cd25fa62b 100755
--- a/src/Client/Adapter/Socket.php
+++ b/src/Client/Adapter/Socket.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 use Zend\Http\Client\Adapter as HttpAdapter,
     Zend\Http\Client\Adapter\Exception as AdapterException,
diff --git a/src/Client/Adapter/Stream.php b/src/Client/Adapter/Stream.php
index 013c6a4e5d..dece56cb4f 100755
--- a/src/Client/Adapter/Stream.php
+++ b/src/Client/Adapter/Stream.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 
 /**
diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
index ab9ab2550e..f4aa25702b 100755
--- a/src/Client/Adapter/Test.php
+++ b/src/Client/Adapter/Test.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Adapter;
 use Zend\Http\Client\Adapter as HttpAdapter,
     Zend\Http\Client\Adapter\Exception as AdapterException,
diff --git a/src/Client/Cookies.php b/src/Client/Cookies.php
index 5f2a67c02e..ec79fa43f8 100644
--- a/src/Client/Cookies.php
+++ b/src/Client/Cookies.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client;
 
 use Zend\Stdlib\ParametersDescription,
diff --git a/src/Client/Exception.php b/src/Client/Exception.php
index 4332b04c28..16945ca787 100755
--- a/src/Client/Exception.php
+++ b/src/Client/Exception.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client;
 
 /**
diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
index facf4c6fde..c93bfddf78 100755
--- a/src/Client/Exception/InvalidArgumentException.php
+++ b/src/Client/Exception/InvalidArgumentException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Exception;
 
 /**
diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
index 84f8876cb6..ea257e2182 100755
--- a/src/Client/Exception/RuntimeException.php
+++ b/src/Client/Exception/RuntimeException.php
@@ -19,9 +19,6 @@
  * @version   $Id$
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Client\Exception;
 
 /**
diff --git a/src/ClientStatic.php b/src/ClientStatic.php
index 3007aedb16..06b02cff21 100644
--- a/src/ClientStatic.php
+++ b/src/ClientStatic.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http;
 
 use Zend\Http\Client;
diff --git a/src/Cookies.php b/src/Cookies.php
index bfd4ec1bc6..6c1f2755f4 100755
--- a/src/Cookies.php
+++ b/src/Cookies.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @namespace
- */
 namespace Zend\Http;
 
 use Zend\Stdlib\ParametersDescription,
diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
index ed799e7483..fcf3e41994 100755
--- a/src/Header/Cookie.php
+++ b/src/Header/Cookie.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Header;
 
 use Zend\Uri,
diff --git a/src/Response/Stream.php b/src/Response/Stream.php
index bc55b83352..ec7eaaceda 100755
--- a/src/Response/Stream.php
+++ b/src/Response/Stream.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Http\Response;
 
 use Zend\Http\Response;
diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
index f9c239847d..dd58c1e5a7 100755
--- a/test/Client/CommonHttpTests.php
+++ b/test/Client/CommonHttpTests.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use Zend\Http\Client as HTTPClient,
     Zend\Http,
diff --git a/test/Client/CurlTest.php b/test/Client/CurlTest.php
index 55f1b2e463..71e9c2cdf2 100755
--- a/test/Client/CurlTest.php
+++ b/test/Client/CurlTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use Zend\Http\Client\Adapter;
 
diff --git a/test/Client/ProxyAdapterTest.php b/test/Client/ProxyAdapterTest.php
index 1ac95006ee..3cfedb6e4c 100755
--- a/test/Client/ProxyAdapterTest.php
+++ b/test/Client/ProxyAdapterTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use Zend\Http\Client;
 
diff --git a/test/Client/SocketKeepaliveTest.php b/test/Client/SocketKeepaliveTest.php
index 45ccce1130..bc70101f0b 100755
--- a/test/Client/SocketKeepaliveTest.php
+++ b/test/Client/SocketKeepaliveTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 
 /**
diff --git a/test/Client/SocketPersistentTest.php b/test/Client/SocketPersistentTest.php
index 769d0d4619..24f3ab62ac 100755
--- a/test/Client/SocketPersistentTest.php
+++ b/test/Client/SocketPersistentTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 
 /**
diff --git a/test/Client/SocketTest.php b/test/Client/SocketTest.php
index f31d6df88b..15af30f854 100755
--- a/test/Client/SocketTest.php
+++ b/test/Client/SocketTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use Zend\Http\Client\Adapter;
 
diff --git a/test/Client/StaticClientTest.php b/test/Client/StaticClientTest.php
index 254c3fe460..47cb60ea72 100644
--- a/test/Client/StaticClientTest.php
+++ b/test/Client/StaticClientTest.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 
 use Zend\Http\ClientStatic as HTTPClient,
diff --git a/test/Client/StaticTest.php b/test/Client/StaticTest.php
index 47ff540365..a4a6a6fcb2 100755
--- a/test/Client/StaticTest.php
+++ b/test/Client/StaticTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use \Zend\Uri\Http as UriHttp,
     \Zend\Http\Client as HTTPClient,
diff --git a/test/Client/TestAdapterTest.php b/test/Client/TestAdapterTest.php
index c4fd19d2b1..ff60b34443 100755
--- a/test/Client/TestAdapterTest.php
+++ b/test/Client/TestAdapterTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 
 /**
diff --git a/test/Client/UseCaseTest.php b/test/Client/UseCaseTest.php
index 2ec7b1597f..56c91129f4 100644
--- a/test/Client/UseCaseTest.php
+++ b/test/Client/UseCaseTest.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @namespace
- */
 namespace ZendTest\Http\Client;
 use Zend\Http\Client as HTTPClient,
     Zend\Http\Client\Adapter,
diff --git a/test/ClientTest.php b/test/ClientTest.php
index 7f3d6e071d..d3e1e53573 100644
--- a/test/ClientTest.php
+++ b/test/ClientTest.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @namespace
- */
 namespace ZendTest\Http;
 
 use Zend\Http\Client,
diff --git a/test/Header/CookieTest.php b/test/Header/CookieTest.php
index 096affbc82..5a1622e18e 100644
--- a/test/Header/CookieTest.php
+++ b/test/Header/CookieTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Http;
 use Zend\Http\Header\Cookie,
     Zend\Http\Header\SetCookie;
diff --git a/test/PhpEnvironment/RequestTest.php b/test/PhpEnvironment/RequestTest.php
index 28a269e60d..a8a4254faf 100644
--- a/test/PhpEnvironment/RequestTest.php
+++ b/test/PhpEnvironment/RequestTest.php
@@ -1,7 +1,4 @@
 <?php
-/**
- * @namespace
- */
 namespace ZendTest\Http\PhpEnvironment;
 
 use PHPUnit_Framework_TestCase as TestCase,
diff --git a/test/RequestTest.php b/test/RequestTest.php
index 4535e81f36..e67bf5ebfc 100644
--- a/test/RequestTest.php
+++ b/test/RequestTest.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @namespace
- */
 namespace ZendTest\Http;
 
 use Zend\Http\Request;
diff --git a/test/ResponseTest.php b/test/ResponseTest.php
index c511ab988c..7060f9953f 100644
--- a/test/ResponseTest.php
+++ b/test/ResponseTest.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @namespace
- */
 namespace ZendTest\Http;
 
 use Zend\Http\Response;