diff --git a/src/Decoder.php b/src/Decoder.php
index 2ed8f3ba7..4de8f9353 100644
--- a/src/Decoder.php
+++ b/src/Decoder.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json;
 
 use Zend\Json\Exception\RuntimeException,
diff --git a/src/Encoder.php b/src/Encoder.php
index 76e706b52..86ea1aeca 100644
--- a/src/Encoder.php
+++ b/src/Encoder.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json;
 
 use Zend\Json\Exception\RecursionException,
diff --git a/src/Exception.php b/src/Exception.php
index 1bd369212..1d07f76b1 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json;
 
 /**
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index f218f0b44..091d93c99 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Exception;
 
 /**
diff --git a/src/Exception/RecursionException.php b/src/Exception/RecursionException.php
index 303310dc4..124a90f6a 100644
--- a/src/Exception/RecursionException.php
+++ b/src/Exception/RecursionException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Exception;
 
 /**
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 77e13129a..8797e7b9d 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Exception;
 
 /**
diff --git a/src/Expr.php b/src/Expr.php
index feba71ed4..c12c42575 100644
--- a/src/Expr.php
+++ b/src/Expr.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json;
 
 /**
diff --git a/src/Json.php b/src/Json.php
index 5e69d3e1b..dd588e045 100644
--- a/src/Json.php
+++ b/src/Json.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json;
 
 use Zend\Json\Exception\RuntimeException,
diff --git a/src/Server/Cache.php b/src/Server/Cache.php
index 734028b19..3c6aa6755 100644
--- a/src/Server/Cache.php
+++ b/src/Server/Cache.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 /**
diff --git a/src/Server/Client.php b/src/Server/Client.php
index b4eb56f35..219a94b11 100644
--- a/src/Server/Client.php
+++ b/src/Server/Client.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 use Zend\Http\Client as HttpClient,
diff --git a/src/Server/Error.php b/src/Server/Error.php
index 9e52d602b..8ad153034 100644
--- a/src/Server/Error.php
+++ b/src/Server/Error.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 /**
diff --git a/src/Server/Exception.php b/src/Server/Exception.php
index fed31abac..1048a64f1 100644
--- a/src/Server/Exception.php
+++ b/src/Server/Exception.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 /**
diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
index a2ae9777e..9a07c1737 100644
--- a/src/Server/Exception/InvalidArgumentException.php
+++ b/src/Server/Exception/InvalidArgumentException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server\Exception;
 
 /**
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
index 74deaf9d0..7c8801e83 100644
--- a/src/Server/Exception/RuntimeException.php
+++ b/src/Server/Exception/RuntimeException.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server\Exception;
 
 /**
diff --git a/src/Server/Request.php b/src/Server/Request.php
index 9dca6d371..853f2730d 100644
--- a/src/Server/Request.php
+++ b/src/Server/Request.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 use Zend\Json;
 
diff --git a/src/Server/Request/Http.php b/src/Server/Request/Http.php
index 4961ca153..f12bb1cbc 100644
--- a/src/Server/Request/Http.php
+++ b/src/Server/Request/Http.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server\Request;
 
 use Zend\Json\Server\Request as JsonRequest;
diff --git a/src/Server/Response.php b/src/Server/Response.php
index 577e22b0b..fb6a90070 100644
--- a/src/Server/Response.php
+++ b/src/Server/Response.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 use Zend\Json\Json;
diff --git a/src/Server/Response/Http.php b/src/Server/Response/Http.php
index 0129cf948..9a9b4fc83 100644
--- a/src/Server/Response/Http.php
+++ b/src/Server/Response/Http.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server\Response;
 
 use Zend\Json\Server\Response as JsonResponse;
diff --git a/src/Server/Server.php b/src/Server/Server.php
index 578e316c5..9b26cb729 100644
--- a/src/Server/Server.php
+++ b/src/Server/Server.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 
 use ReflectionFunction,
diff --git a/src/Server/Smd.php b/src/Server/Smd.php
index 9cb2c25c3..c7c745b73 100644
--- a/src/Server/Smd.php
+++ b/src/Server/Smd.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server;
 use Zend\Json\Server\Exception\InvalidArgumentException,
     Zend\Json\Server\Exception\RuntimeException;
diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
index 268693e16..fc0fef2b7 100644
--- a/src/Server/Smd/Service.php
+++ b/src/Server/Smd/Service.php
@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\Json\Server\Smd;
 use Zend\Json\Server\Smd,
     Zend\Json\Server,
diff --git a/test/JsonTest.php b/test/JsonTest.php
index 6e35d8b23..8117d7d97 100644
--- a/test/JsonTest.php
+++ b/test/JsonTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json;
 use Zend\Json;
 
diff --git a/test/JsonXmlTest.php b/test/JsonXmlTest.php
index 71a0c8c79..905720e81 100644
--- a/test/JsonXmlTest.php
+++ b/test/JsonXmlTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json;
 use Zend\Json;
 
diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
index 8a4f2be2f..44428578f 100644
--- a/test/Server/CacheTest.php
+++ b/test/Server/CacheTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 use Zend\Json\Server;
 
diff --git a/test/Server/ClientTest.php b/test/Server/ClientTest.php
index 560ee7d09..ed597aa43 100644
--- a/test/Server/ClientTest.php
+++ b/test/Server/ClientTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 
 use Zend\Http\Client as HttpClient,
diff --git a/test/Server/ErrorTest.php b/test/Server/ErrorTest.php
index 781eea5ab..c032e4b6e 100644
--- a/test/Server/ErrorTest.php
+++ b/test/Server/ErrorTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 use Zend\Json\Server;
 use Zend\Json;
diff --git a/test/Server/RequestTest.php b/test/Server/RequestTest.php
index 02ab291ab..29dc90bd7 100644
--- a/test/Server/RequestTest.php
+++ b/test/Server/RequestTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 use Zend\Json;
 
diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
index 14e8221c1..bd05fb12f 100644
--- a/test/Server/ResponseTest.php
+++ b/test/Server/ResponseTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 use Zend\Json\Server,
     Zend\Json;
diff --git a/test/Server/Smd/ServiceTest.php b/test/Server/Smd/ServiceTest.php
index 5e5e60c7d..be5b83c38 100644
--- a/test/Server/Smd/ServiceTest.php
+++ b/test/Server/Smd/ServiceTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server\Smd;
 use Zend\Json\Server\Smd\Service;
 use Zend\Json\Server;
diff --git a/test/Server/SmdTest.php b/test/Server/SmdTest.php
index 6237b55f0..fe4665b95 100644
--- a/test/Server/SmdTest.php
+++ b/test/Server/SmdTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json\Server;
 use Zend\Json\Server\Smd,
     Zend\Json\Server,
diff --git a/test/ServerTest.php b/test/ServerTest.php
index 9c5bb1a23..9888f1450 100644
--- a/test/ServerTest.php
+++ b/test/ServerTest.php
@@ -19,9 +19,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace ZendTest\Json;
 use Zend\Json\Server,
     Zend\Json,