diff --git a/src/Decoder.php b/src/Decoder.php
index bf07d0996..38d10cd4d 100644
--- a/src/Decoder.php
+++ b/src/Decoder.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Encoder.php b/src/Encoder.php
index d8e3ab103..f5a7718ba 100644
--- a/src/Encoder.php
+++ b/src/Encoder.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Exception.php b/src/Exception.php
index c1f00f0ab..fa2d17bcf 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Expr.php b/src/Expr.php
index cf3494f5e..13ff12849 100644
--- a/src/Expr.php
+++ b/src/Expr.php
@@ -17,7 +17,6 @@
  * @subpackage Expr
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Json.php b/src/Json.php
index 3e478a6fc..29cc8fdce 100644
--- a/src/Json.php
+++ b/src/Json.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Cache.php b/src/Server/Cache.php
index 05768f451..6483c331b 100644
--- a/src/Server/Cache.php
+++ b/src/Server/Cache.php
@@ -17,7 +17,6 @@
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Error.php b/src/Server/Error.php
index 18bc6ec26..3fb1a235c 100644
--- a/src/Server/Error.php
+++ b/src/Server/Error.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Exception.php b/src/Server/Exception.php
index cbe473549..62d0e0f3c 100644
--- a/src/Server/Exception.php
+++ b/src/Server/Exception.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Request.php b/src/Server/Request.php
index e1432159e..c2f11447d 100644
--- a/src/Server/Request.php
+++ b/src/Server/Request.php
@@ -17,7 +17,6 @@
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Request/Http.php b/src/Server/Request/Http.php
index f4b70d3ce..48d751b98 100644
--- a/src/Server/Request/Http.php
+++ b/src/Server/Request/Http.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Response.php b/src/Server/Response.php
index 7a9b7d9a1..f12c4db39 100644
--- a/src/Server/Response.php
+++ b/src/Server/Response.php
@@ -17,7 +17,6 @@
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Response/Http.php b/src/Server/Response/Http.php
index 565ae2625..982bb01b7 100644
--- a/src/Server/Response/Http.php
+++ b/src/Server/Response/Http.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Server.php b/src/Server/Server.php
index 1f893a991..a26d86826 100644
--- a/src/Server/Server.php
+++ b/src/Server/Server.php
@@ -16,7 +16,6 @@
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Smd.php b/src/Server/Smd.php
index 85ff4279b..332b1e7d3 100644
--- a/src/Server/Smd.php
+++ b/src/Server/Smd.php
@@ -17,7 +17,6 @@
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
index 35e061182..1aeba28e6 100644
--- a/src/Server/Smd/Service.php
+++ b/src/Server/Smd/Service.php
@@ -34,7 +34,6 @@
  * @uses       \Zend\Json\Server\Smd\Smd
  * @package    Zend_Json
  * @subpackage Server
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
diff --git a/test/JSONTest.php b/test/JSONTest.php
index cf381e8ae..cdea4554d 100644
--- a/test/JSONTest.php
+++ b/test/JSONTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/JSONXMLTest.php b/test/JSONXMLTest.php
index 387ddb54f..a9bd5f69d 100644
--- a/test/JSONXMLTest.php
+++ b/test/JSONXMLTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
index 8bb44c5ac..a4e777bc6 100644
--- a/test/Server/CacheTest.php
+++ b/test/Server/CacheTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/ErrorTest.php b/test/Server/ErrorTest.php
index 3e53e7d91..a53a9eee6 100644
--- a/test/Server/ErrorTest.php
+++ b/test/Server/ErrorTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/RequestTest.php b/test/Server/RequestTest.php
index 5b284b08f..9279271bd 100644
--- a/test/Server/RequestTest.php
+++ b/test/Server/RequestTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
index b626c4457..732c4c8d7 100644
--- a/test/Server/ResponseTest.php
+++ b/test/Server/ResponseTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/SMD/ServiceTest.php b/test/Server/SMD/ServiceTest.php
index 25a08f4d4..9557186fc 100644
--- a/test/Server/SMD/ServiceTest.php
+++ b/test/Server/SMD/ServiceTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/Server/SMDTest.php b/test/Server/SMDTest.php
index e4973a7d8..29176685b 100644
--- a/test/Server/SMDTest.php
+++ b/test/Server/SMDTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**
diff --git a/test/ServerTest.php b/test/ServerTest.php
index a5614936a..9695b3b63 100644
--- a/test/ServerTest.php
+++ b/test/ServerTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**