diff --git a/aclocal/ax_javac_and_java.m4 b/aclocal/ax_javac_and_java.m4
index da41fbd..3c8577f 100644
--- a/aclocal/ax_javac_and_java.m4
+++ b/aclocal/ax_javac_and_java.m4
@@ -16,7 +16,6 @@
 dnl "JAVA" are set to the appropriate commands.
 dnl
 dnl @category Java
-dnl @author David Reiss <dreiss@facebook.com>
 dnl @version 2009-02-09
 dnl @license AllPermissive
 dnl
diff --git a/aclocal/ax_lib_event.m4 b/aclocal/ax_lib_event.m4
index 94529ca..4193a7b 100644
--- a/aclocal/ax_lib_event.m4
+++ b/aclocal/ax_lib_event.m4
@@ -25,7 +25,6 @@
 dnl
 dnl @category InstalledPackages
 dnl @category C
-dnl @author David Reiss <dreiss@facebook.com>
 dnl @version 2007-09-12
 dnl @license AllPermissive
 
diff --git a/aclocal/ax_lib_zlib.m4 b/aclocal/ax_lib_zlib.m4
index 64b0b85..be4b6bb 100644
--- a/aclocal/ax_lib_zlib.m4
+++ b/aclocal/ax_lib_zlib.m4
@@ -23,7 +23,6 @@
 dnl
 dnl @category InstalledPackages
 dnl @category C
-dnl @author David Reiss <dreiss@facebook.com>
 dnl @version 2007-09-12
 dnl @license AllPermissive
 
diff --git a/aclocal/ax_thrift_internal.m4 b/aclocal/ax_thrift_internal.m4
index e0e6dad..9348f4a 100644
--- a/aclocal/ax_thrift_internal.m4
+++ b/aclocal/ax_thrift_internal.m4
@@ -7,7 +7,6 @@
 dnl These macros have poor error handling and are poorly documented.
 dnl They are intended only for internal use by the Thrift compiler.
 dnl
-dnl @author David Reiss <dreiss@facebook.com>
 dnl @version 2008-02-20
 dnl @license AllPermissive
 
diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc
index 9814aa0..6da5633 100644
--- a/compiler/cpp/src/generate/t_cocoa_generator.cc
+++ b/compiler/cpp/src/generate/t_cocoa_generator.cc
@@ -20,7 +20,6 @@
 /**
  * Objective-C code generator.
  *
- * @author Andrew McGeachie <geechorama@gmail.com>, although it was
  * mostly copy/pasting/tweaking from mcslee's work.
  */
 class t_cocoa_generator : public t_oop_generator {
diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index 6be3504..8761f96 100644
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -22,7 +22,6 @@
 /**
  * C++ code generator. This is legitimacy incarnate.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_cpp_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc
index 64cadcf..b670199 100644
--- a/compiler/cpp/src/generate/t_erl_generator.cc
+++ b/compiler/cpp/src/generate/t_erl_generator.cc
@@ -22,7 +22,6 @@
 /**
  * Erlang code generator.
  *
- * @author
  */
 class t_erl_generator : public t_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_generator.cc b/compiler/cpp/src/generate/t_generator.cc
index ff3ed57..2369749 100644
--- a/compiler/cpp/src/generate/t_generator.cc
+++ b/compiler/cpp/src/generate/t_generator.cc
@@ -13,7 +13,6 @@
  * program to perform the correct actions.
  *
  * @param program The thrift program to compile into C++ source
- * @author Mark Slee <mcslee@facebook.com>
  */
 void t_generator::generate_program() {
   // Initialize the generator
diff --git a/compiler/cpp/src/generate/t_generator.h b/compiler/cpp/src/generate/t_generator.h
index 8636314..a2bfa1c 100644
--- a/compiler/cpp/src/generate/t_generator.h
+++ b/compiler/cpp/src/generate/t_generator.h
@@ -18,7 +18,6 @@
  * routines for code generation and contains the top level method that
  * dispatches code generation across various components.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_hs_generator.cc b/compiler/cpp/src/generate/t_hs_generator.cc
index d1e3f9e..0ea5ddc 100644
--- a/compiler/cpp/src/generate/t_hs_generator.cc
+++ b/compiler/cpp/src/generate/t_hs_generator.cc
@@ -21,7 +21,6 @@
 /**
  * Haskell code generator.
  *
- * @author Iain Proctor <iproctor@facebook.com>
  */
 class t_hs_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_html_generator.cc b/compiler/cpp/src/generate/t_html_generator.cc
index 6b8bcc1..fc05709 100644
--- a/compiler/cpp/src/generate/t_html_generator.cc
+++ b/compiler/cpp/src/generate/t_html_generator.cc
@@ -21,7 +21,6 @@
 /**
  * HTML code generator
  *
- * @author Dave Engberg, although it was
  * mostly copy/pasting/tweaking from mcslee's work.
  */
 class t_html_generator : public t_generator {
diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
index b648a66..193b029 100644
--- a/compiler/cpp/src/generate/t_java_generator.cc
+++ b/compiler/cpp/src/generate/t_java_generator.cc
@@ -22,7 +22,6 @@
 /**
  * Java code generator.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_java_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_ocaml_generator.cc b/compiler/cpp/src/generate/t_ocaml_generator.cc
index e38f7b1..97f9b93 100644
--- a/compiler/cpp/src/generate/t_ocaml_generator.cc
+++ b/compiler/cpp/src/generate/t_ocaml_generator.cc
@@ -21,7 +21,6 @@
 /**
  * OCaml code generator.
  *
- * @author Iain Proctor <iproctor@facebook.com>
  */
 class t_ocaml_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_oop_generator.h b/compiler/cpp/src/generate/t_oop_generator.h
index fb4585c..fb770ff 100644
--- a/compiler/cpp/src/generate/t_oop_generator.h
+++ b/compiler/cpp/src/generate/t_oop_generator.h
@@ -21,7 +21,6 @@
  * Class with utility methods shared across common object oriented languages.
  * Specifically, most of this stuff is for C++/Java.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_oop_generator : public t_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_perl_generator.cc b/compiler/cpp/src/generate/t_perl_generator.cc
index 737dce9..05cdb9f 100644
--- a/compiler/cpp/src/generate/t_perl_generator.cc
+++ b/compiler/cpp/src/generate/t_perl_generator.cc
@@ -21,7 +21,6 @@
 /**
  * PERL code generator.
  *
- * @author Jake Luciani <jakers@gmail.com>
  */
 class t_perl_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc
index 08d0916..a839443 100644
--- a/compiler/cpp/src/generate/t_php_generator.cc
+++ b/compiler/cpp/src/generate/t_php_generator.cc
@@ -20,7 +20,6 @@
 /**
  * PHP code generator.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_php_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc
index f69c57b..aaee932 100644
--- a/compiler/cpp/src/generate/t_py_generator.cc
+++ b/compiler/cpp/src/generate/t_py_generator.cc
@@ -22,7 +22,6 @@
 /**
  * Python code generator.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_py_generator : public t_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_rb_generator.cc b/compiler/cpp/src/generate/t_rb_generator.cc
index 3169556..d23b14a 100644
--- a/compiler/cpp/src/generate/t_rb_generator.cc
+++ b/compiler/cpp/src/generate/t_rb_generator.cc
@@ -24,7 +24,6 @@
 /**
  * Ruby code generator.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_rb_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_st_generator.cc b/compiler/cpp/src/generate/t_st_generator.cc
index 1ce20f2..576c11e 100644
--- a/compiler/cpp/src/generate/t_st_generator.cc
+++ b/compiler/cpp/src/generate/t_st_generator.cc
@@ -25,7 +25,6 @@
 /**
  * Smalltalk code generator.
  *
- * @author Patrick Collison <patrick@collison.ie>
  */
 class t_st_generator : public t_oop_generator {
  public:
diff --git a/compiler/cpp/src/generate/t_xsd_generator.cc b/compiler/cpp/src/generate/t_xsd_generator.cc
index bccec2f..93a3786 100644
--- a/compiler/cpp/src/generate/t_xsd_generator.cc
+++ b/compiler/cpp/src/generate/t_xsd_generator.cc
@@ -19,7 +19,6 @@
 /**
  * XSD generator, creates an XSD for the base types etc.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_xsd_generator : public t_generator {
  public:
diff --git a/compiler/cpp/src/globals.h b/compiler/cpp/src/globals.h
index 8560efd..0e89f51 100644
--- a/compiler/cpp/src/globals.h
+++ b/compiler/cpp/src/globals.h
@@ -21,7 +21,6 @@
  * global variables such that the parser does the right thing and puts entries
  * into the right containers, etc.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc
index 0e31bd9..b16e6ca 100644
--- a/compiler/cpp/src/main.cc
+++ b/compiler/cpp/src/main.cc
@@ -12,7 +12,6 @@
  * code for each language lives in a file by the language name under the
  * generate/ folder, and all parse structures live in parse/
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 #include <cassert>
diff --git a/compiler/cpp/src/parse/t_base_type.h b/compiler/cpp/src/parse/t_base_type.h
index b41e737..05bff0b 100644
--- a/compiler/cpp/src/parse/t_base_type.h
+++ b/compiler/cpp/src/parse/t_base_type.h
@@ -14,7 +14,6 @@
  * A thrift base type, which must be one of the defined enumerated types inside
  * this definition.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_base_type : public t_type {
  public:
diff --git a/compiler/cpp/src/parse/t_const.h b/compiler/cpp/src/parse/t_const.h
index dadcfd2..a89036e 100644
--- a/compiler/cpp/src/parse/t_const.h
+++ b/compiler/cpp/src/parse/t_const.h
@@ -16,7 +16,6 @@
  * of the value object, since that is not determined until after parsing the
  * whole thing out.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_const : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_const_value.h b/compiler/cpp/src/parse/t_const_value.h
index 4d5845f..a8c426e 100644
--- a/compiler/cpp/src/parse/t_const_value.h
+++ b/compiler/cpp/src/parse/t_const_value.h
@@ -16,7 +16,6 @@
  * A const value is something parsed that could be a map, set, list, struct
  * or whatever.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_const_value {
  public:
diff --git a/compiler/cpp/src/parse/t_doc.h b/compiler/cpp/src/parse/t_doc.h
index 6bdcc29..6d5f959 100644
--- a/compiler/cpp/src/parse/t_doc.h
+++ b/compiler/cpp/src/parse/t_doc.h
@@ -10,7 +10,6 @@
 /**
  * Documentation stubs
  *
- * @author Charlie Cheever <charlie@facebook.com>
  */
 class t_doc {
 
diff --git a/compiler/cpp/src/parse/t_enum.h b/compiler/cpp/src/parse/t_enum.h
index 810f3be..4c545cd 100644
--- a/compiler/cpp/src/parse/t_enum.h
+++ b/compiler/cpp/src/parse/t_enum.h
@@ -13,7 +13,6 @@
 /**
  * An enumerated type. A list of constant objects with a name for the type.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_enum : public t_type {
  public:
diff --git a/compiler/cpp/src/parse/t_enum_value.h b/compiler/cpp/src/parse/t_enum_value.h
index c732656..15ab1e0 100644
--- a/compiler/cpp/src/parse/t_enum_value.h
+++ b/compiler/cpp/src/parse/t_enum_value.h
@@ -15,7 +15,6 @@
  * symbol identifiers that may or may not have an explicit value associated
  * with them.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_enum_value : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_field.h b/compiler/cpp/src/parse/t_field.h
index 7181697..ae9ac78 100644
--- a/compiler/cpp/src/parse/t_field.h
+++ b/compiler/cpp/src/parse/t_field.h
@@ -19,7 +19,6 @@
  * Class to represent a field in a thrift structure. A field has a data type,
  * a symbolic name, and a numeric identifier.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_field : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_function.h b/compiler/cpp/src/parse/t_function.h
index 74dac63..4cdd079 100644
--- a/compiler/cpp/src/parse/t_function.h
+++ b/compiler/cpp/src/parse/t_function.h
@@ -17,7 +17,6 @@
  * optional modifiers, and an argument list, which is implemented as a thrift
  * struct.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_function : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_list.h b/compiler/cpp/src/parse/t_list.h
index 0ff83c5..59b176e 100644
--- a/compiler/cpp/src/parse/t_list.h
+++ b/compiler/cpp/src/parse/t_list.h
@@ -12,7 +12,6 @@
 /**
  * A list is a lightweight container type that just wraps another data type.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_list : public t_container {
  public:
diff --git a/compiler/cpp/src/parse/t_map.h b/compiler/cpp/src/parse/t_map.h
index b5e051e..20a32be 100644
--- a/compiler/cpp/src/parse/t_map.h
+++ b/compiler/cpp/src/parse/t_map.h
@@ -13,7 +13,6 @@
  * A map is a lightweight container type that just wraps another two data
  * types.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_map : public t_container {
  public:
diff --git a/compiler/cpp/src/parse/t_program.h b/compiler/cpp/src/parse/t_program.h
index c71ebcc..cee5410 100644
--- a/compiler/cpp/src/parse/t_program.h
+++ b/compiler/cpp/src/parse/t_program.h
@@ -40,7 +40,6 @@
  *
  * The program module also contains the definitions of the base types.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_program : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_scope.h b/compiler/cpp/src/parse/t_scope.h
index e03956e..7cb0738 100644
--- a/compiler/cpp/src/parse/t_scope.h
+++ b/compiler/cpp/src/parse/t_scope.h
@@ -19,7 +19,6 @@
  * used to determine code generation, but rather to resolve identifiers at
  * parse time.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_scope {
  public:
diff --git a/compiler/cpp/src/parse/t_service.h b/compiler/cpp/src/parse/t_service.h
index f5665b6..71a2f8a 100644
--- a/compiler/cpp/src/parse/t_service.h
+++ b/compiler/cpp/src/parse/t_service.h
@@ -15,7 +15,6 @@
 /**
  * A service consists of a set of functions.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_service : public t_type {
  public:
diff --git a/compiler/cpp/src/parse/t_set.h b/compiler/cpp/src/parse/t_set.h
index c52421a..adf0a56 100644
--- a/compiler/cpp/src/parse/t_set.h
+++ b/compiler/cpp/src/parse/t_set.h
@@ -12,7 +12,6 @@
 /**
  * A set is a lightweight container type that just wraps another data type.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_set : public t_container {
  public:
diff --git a/compiler/cpp/src/parse/t_struct.h b/compiler/cpp/src/parse/t_struct.h
index bca51f6..dc7019e 100644
--- a/compiler/cpp/src/parse/t_struct.h
+++ b/compiler/cpp/src/parse/t_struct.h
@@ -20,7 +20,6 @@
  * A struct is a container for a set of member fields that has a name. Structs
  * are also used to implement exception types.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_struct : public t_type {
  public:
diff --git a/compiler/cpp/src/parse/t_type.h b/compiler/cpp/src/parse/t_type.h
index 6f178bd..c162946 100644
--- a/compiler/cpp/src/parse/t_type.h
+++ b/compiler/cpp/src/parse/t_type.h
@@ -24,7 +24,6 @@
  * used by the code generator to branch based upon different handling for the
  * various types.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_type : public t_doc {
  public:
diff --git a/compiler/cpp/src/parse/t_typedef.h b/compiler/cpp/src/parse/t_typedef.h
index f2c9713..db6a2c3 100644
--- a/compiler/cpp/src/parse/t_typedef.h
+++ b/compiler/cpp/src/parse/t_typedef.h
@@ -16,7 +16,6 @@
  * ignore typedefs and just use the underlying type directly, though in C++
  * the symbolic naming can be quite useful for code clarity.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class t_typedef : public t_type {
  public:
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index 1051e27..ef49577 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -10,7 +10,6 @@
  * Thrift scanner.
  *
  * Tokenizes a thrift definition file.
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 %{
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
index 381b434..743fa2c 100644
--- a/compiler/cpp/src/thrifty.yy
+++ b/compiler/cpp/src/thrifty.yy
@@ -10,7 +10,6 @@
  *
  * This parser is used on a thrift definition file.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 #define __STDC_LIMIT_MACROS
diff --git a/contrib/fb303/cpp/FacebookBase.h b/contrib/fb303/cpp/FacebookBase.h
index 0efe655..b62f4d0 100644
--- a/contrib/fb303/cpp/FacebookBase.h
+++ b/contrib/fb303/cpp/FacebookBase.h
@@ -29,7 +29,6 @@
 /**
  * Base Facebook service implementation in C++.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class FacebookBase : virtual public FacebookServiceIf {
  protected:
diff --git a/contrib/fb303/cpp/ServiceTracker.cpp b/contrib/fb303/cpp/ServiceTracker.cpp
index bb3f219..9153bef 100644
--- a/contrib/fb303/cpp/ServiceTracker.cpp
+++ b/contrib/fb303/cpp/ServiceTracker.cpp
@@ -60,7 +60,6 @@
  * @param const ServiceMethod &serviceMethod A reference to the ServiceMethod
  *                                           object instantiated at the start
  *                                           of the service method.
- * @author Karl Voskuil
  */
 void
 ServiceTracker::startService(const ServiceMethod &serviceMethod)
@@ -115,7 +114,6 @@
  *                                           of the service method.
  * @return int64_t Elapsed units (see stopwatchUnit_) since ServiceMethod
  *                 instantiation.
- * @author Karl Voskuil
  */
 int64_t
 ServiceTracker::stepService(const ServiceMethod &serviceMethod,
@@ -138,7 +136,6 @@
  * @param const ServiceMethod &serviceMethod A reference to the ServiceMethod
  *                                           object instantiated at the start
  *                                           of the service method.
- * @author Karl Voskuil
  */
 void
 ServiceTracker::finishService(const ServiceMethod &serviceMethod)
@@ -225,7 +222,6 @@
  * uses of the object variables (and calls to this method) with a
  * mutex.
  *
- * @author Karl Voskuil
  */
 void
 ServiceTracker::reportCheckpoint()
@@ -287,7 +283,6 @@
  * activity.
  *
  * @param shared_ptr<ThreadManager> threadManager The server's thread manager.
- * @author Karl Voskuil
  */
 void
 ServiceTracker::setThreadManager(boost::shared_ptr<ThreadManager>
@@ -345,7 +340,6 @@
  * Creates a Stopwatch, which can report the time elapsed since its
  * creation.
  *
- * @author Karl Voskuil
  */
 Stopwatch::Stopwatch()
 {
@@ -417,7 +411,6 @@
  *                           of service method parameters).
  * @param const string &signature A signature uniquely identifying the method
  *                                invocation (usually name plus parameters).
- * @author Karl Voskuil
  */
 ServiceMethod::ServiceMethod(ServiceTracker *tracker,
                              const string &name,
diff --git a/contrib/fb303/if/fb303.thrift b/contrib/fb303/if/fb303.thrift
index dc10e50..fb9e220 100644
--- a/contrib/fb303/if/fb303.thrift
+++ b/contrib/fb303/if/fb303.thrift
@@ -13,7 +13,6 @@
  * provided in the base implementation, and in other cases they simply define
  * methods that inheriting applications should implement (i.e. status report)
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 namespace java com.facebook.fb303
diff --git a/contrib/fb303/php/FacebookBase.php b/contrib/fb303/php/FacebookBase.php
index 0bcfe32..8360112 100644
--- a/contrib/fb303/php/FacebookBase.php
+++ b/contrib/fb303/php/FacebookBase.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 
 /**
diff --git a/lib/cpp/src/TLogging.h b/lib/cpp/src/TLogging.h
index 6fb7484..9224289 100644
--- a/lib/cpp/src/TLogging.h
+++ b/lib/cpp/src/TLogging.h
@@ -14,7 +14,6 @@
 /**
  * Contains utility macros for debugging and logging.
  *
- * @author Aditya Agarwal
  */
 
 #ifndef HAVE_CLOCK_GETTIME
diff --git a/lib/cpp/src/TProcessor.h b/lib/cpp/src/TProcessor.h
index 3c4b171..2ec6b2f 100644
--- a/lib/cpp/src/TProcessor.h
+++ b/lib/cpp/src/TProcessor.h
@@ -19,7 +19,6 @@
  * though the typical case is for some sort of server that either generates
  * responses to an input stream or forwards data from one pipe onto another.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TProcessor {
  public:
diff --git a/lib/cpp/src/TReflectionLocal.h b/lib/cpp/src/TReflectionLocal.h
index 3644140..e9e76ac 100644
--- a/lib/cpp/src/TReflectionLocal.h
+++ b/lib/cpp/src/TReflectionLocal.h
@@ -16,7 +16,6 @@
  * and generation of this particular representation of Thrift types.
  * (It is called local because it cannot be serialized by Thrift).
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 
 namespace apache { namespace thrift { namespace reflection { namespace local {
diff --git a/lib/cpp/src/concurrency/FunctionRunner.h b/lib/cpp/src/concurrency/FunctionRunner.h
index 6379c1c..29fa5ad 100644
--- a/lib/cpp/src/concurrency/FunctionRunner.h
+++ b/lib/cpp/src/concurrency/FunctionRunner.h
@@ -26,7 +26,6 @@
  *  thread->start();
  *
  *
- * @author mrabkin
  */
 
 class FunctionRunner : public Runnable {
diff --git a/lib/cpp/src/concurrency/Monitor.cpp b/lib/cpp/src/concurrency/Monitor.cpp
index 81855dc..f9751d4 100644
--- a/lib/cpp/src/concurrency/Monitor.cpp
+++ b/lib/cpp/src/concurrency/Monitor.cpp
@@ -20,7 +20,6 @@
 /**
  * Monitor implementation using the POSIX pthread library
  *
- * @author marc
  * @version $Id:$
  */
 class Monitor::Impl {
diff --git a/lib/cpp/src/concurrency/Monitor.h b/lib/cpp/src/concurrency/Monitor.h
index fe7bf11..6cfb148 100644
--- a/lib/cpp/src/concurrency/Monitor.h
+++ b/lib/cpp/src/concurrency/Monitor.h
@@ -22,7 +22,6 @@
  * bit constness.  This allows const methods to call monitor methods without
  * needing to cast away constness or change to non-const signatures.
  *
- * @author marc
  * @version $Id:$
  */
 class Monitor {
diff --git a/lib/cpp/src/concurrency/Mutex.cpp b/lib/cpp/src/concurrency/Mutex.cpp
index af68db6..eef97fd 100644
--- a/lib/cpp/src/concurrency/Mutex.cpp
+++ b/lib/cpp/src/concurrency/Mutex.cpp
@@ -16,7 +16,6 @@
 /**
  * Implementation of Mutex class using POSIX mutex
  *
- * @author marc
  * @version $Id:$
  */
 class Mutex::impl {
@@ -99,7 +98,6 @@
 /**
  * Implementation of ReadWriteMutex class using POSIX rw lock
  *
- * @author boz
  * @version $Id:$
  */
 class ReadWriteMutex::impl {
diff --git a/lib/cpp/src/concurrency/Mutex.h b/lib/cpp/src/concurrency/Mutex.h
index 92eb0db..387a9fe 100644
--- a/lib/cpp/src/concurrency/Mutex.h
+++ b/lib/cpp/src/concurrency/Mutex.h
@@ -14,7 +14,6 @@
 /**
  * A simple mutex class
  *
- * @author marc
  * @version $Id:$
  */
 class Mutex {
diff --git a/lib/cpp/src/concurrency/PosixThreadFactory.cpp b/lib/cpp/src/concurrency/PosixThreadFactory.cpp
index 9655a86..59d7cfa 100644
--- a/lib/cpp/src/concurrency/PosixThreadFactory.cpp
+++ b/lib/cpp/src/concurrency/PosixThreadFactory.cpp
@@ -26,7 +26,6 @@
 /**
  * The POSIX thread class.
  *
- * @author marc
  * @version $Id:$
  */
 class PthreadThread: public Thread {
diff --git a/lib/cpp/src/concurrency/PosixThreadFactory.h b/lib/cpp/src/concurrency/PosixThreadFactory.h
index 66df4b3..2baa001 100644
--- a/lib/cpp/src/concurrency/PosixThreadFactory.h
+++ b/lib/cpp/src/concurrency/PosixThreadFactory.h
@@ -16,7 +16,6 @@
 /**
  * A thread factory to create posix threads
  *
- * @author marc
  * @version $Id:$
  */
 class PosixThreadFactory : public ThreadFactory {
diff --git a/lib/cpp/src/concurrency/Thread.h b/lib/cpp/src/concurrency/Thread.h
index 0ce5e17..ca4b42b 100644
--- a/lib/cpp/src/concurrency/Thread.h
+++ b/lib/cpp/src/concurrency/Thread.h
@@ -17,7 +17,6 @@
 /**
  * Minimal runnable class.  More or less analogous to java.lang.Runnable.
  *
- * @author marc
  * @version $Id:$
  */
 class Runnable {
diff --git a/lib/cpp/src/concurrency/ThreadManager.cpp b/lib/cpp/src/concurrency/ThreadManager.cpp
index 11c19a8..8a86667 100644
--- a/lib/cpp/src/concurrency/ThreadManager.cpp
+++ b/lib/cpp/src/concurrency/ThreadManager.cpp
@@ -31,7 +31,6 @@
  * it maintains statistics on number of idle threads, number of active threads,
  * task backlog, and average wait and service times.
  *
- * @author marc
  * @version $Id:$
  */
 class ThreadManager::Impl : public ThreadManager  {
diff --git a/lib/cpp/src/concurrency/ThreadManager.h b/lib/cpp/src/concurrency/ThreadManager.h
index b973b08..9cfccf3 100644
--- a/lib/cpp/src/concurrency/ThreadManager.h
+++ b/lib/cpp/src/concurrency/ThreadManager.h
@@ -16,7 +16,6 @@
 /**
  * Thread Pool Manager and related classes
  *
- * @author marc
  * @version $Id:$
  */
 class ThreadManager;
diff --git a/lib/cpp/src/concurrency/TimerManager.cpp b/lib/cpp/src/concurrency/TimerManager.cpp
index c9555fb..76ecd93 100644
--- a/lib/cpp/src/concurrency/TimerManager.cpp
+++ b/lib/cpp/src/concurrency/TimerManager.cpp
@@ -22,7 +22,6 @@
 /**
  * TimerManager class
  *
- * @author marc
  * @version $Id:$
  */
 class TimerManager::Task : public Runnable {
diff --git a/lib/cpp/src/concurrency/TimerManager.h b/lib/cpp/src/concurrency/TimerManager.h
index 3729646..23f70e8 100644
--- a/lib/cpp/src/concurrency/TimerManager.h
+++ b/lib/cpp/src/concurrency/TimerManager.h
@@ -22,7 +22,6 @@
  *
  * This class dispatches timer tasks when they fall due.
  *
- * @author marc
  * @version $Id:$
  */
 class TimerManager {
diff --git a/lib/cpp/src/concurrency/Util.h b/lib/cpp/src/concurrency/Util.h
index fa5b7f4..a2e7dfc 100644
--- a/lib/cpp/src/concurrency/Util.h
+++ b/lib/cpp/src/concurrency/Util.h
@@ -25,7 +25,6 @@
  * platform dependent crap.  Rather it should be inluded directly in
  * concurrency library implementation source.
  *
- * @author marc
  * @version $Id:$
  */
 class Util {
diff --git a/lib/cpp/src/concurrency/test/ThreadFactoryTests.h b/lib/cpp/src/concurrency/test/ThreadFactoryTests.h
index 440f69b..2615736 100644
--- a/lib/cpp/src/concurrency/test/ThreadFactoryTests.h
+++ b/lib/cpp/src/concurrency/test/ThreadFactoryTests.h
@@ -22,7 +22,6 @@
 /**
  * ThreadManagerTests class
  *
- * @author marc
  * @version $Id:$
  */
 class ThreadFactoryTests {
diff --git a/lib/cpp/src/concurrency/test/ThreadManagerTests.h b/lib/cpp/src/concurrency/test/ThreadManagerTests.h
index feb3e47..650f17f 100644
--- a/lib/cpp/src/concurrency/test/ThreadManagerTests.h
+++ b/lib/cpp/src/concurrency/test/ThreadManagerTests.h
@@ -23,7 +23,6 @@
 /**
  * ThreadManagerTests class
  *
- * @author marc
  * @version $Id:$
  */
 class ThreadManagerTests {
diff --git a/lib/cpp/src/concurrency/test/TimerManagerTests.h b/lib/cpp/src/concurrency/test/TimerManagerTests.h
index 9e4e757..a6a2661 100644
--- a/lib/cpp/src/concurrency/test/TimerManagerTests.h
+++ b/lib/cpp/src/concurrency/test/TimerManagerTests.h
@@ -19,7 +19,6 @@
 /**
  * ThreadManagerTests class
  *
- * @author marc
  * @version $Id:$
  */
 class TimerManagerTests {
diff --git a/lib/cpp/src/processor/PeekProcessor.h b/lib/cpp/src/processor/PeekProcessor.h
index 6404b71..5cfe1ae 100644
--- a/lib/cpp/src/processor/PeekProcessor.h
+++ b/lib/cpp/src/processor/PeekProcessor.h
@@ -20,7 +20,6 @@
  * Class for peeking at the raw data that is being processed by another processor
  * and gives the derived class a chance to change behavior accordingly
  *
- * @author James Wang <jwang@facebook.com>
  */
 class PeekProcessor : public apache::thrift::TProcessor {
 
diff --git a/lib/cpp/src/processor/StatsProcessor.h b/lib/cpp/src/processor/StatsProcessor.h
index 2cccab1..accf262 100644
--- a/lib/cpp/src/processor/StatsProcessor.h
+++ b/lib/cpp/src/processor/StatsProcessor.h
@@ -17,7 +17,6 @@
 /*
  * Class for keeping track of function call statistics and printing them if desired
  *
- * @author James Wang <jwang@facebook.com>
  */
 class StatsProcessor : public apache::thrift::TProcessor {
 public:
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
index b38b493..6be21e0 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.h
+++ b/lib/cpp/src/protocol/TBinaryProtocol.h
@@ -17,7 +17,6 @@
  * The default binary protocol for thrift. Writes all data in a very basic
  * binary format, essentially just spitting out the raw bytes.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TBinaryProtocol : public TProtocol {
  protected:
diff --git a/lib/cpp/src/protocol/TDebugProtocol.h b/lib/cpp/src/protocol/TDebugProtocol.h
index fa4b807..c1c8b59 100644
--- a/lib/cpp/src/protocol/TDebugProtocol.h
+++ b/lib/cpp/src/protocol/TDebugProtocol.h
@@ -32,7 +32,6 @@
  * Protocol that prints the payload in a nice human-readable format.
  * Reading from this protocol is not supported.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TDebugProtocol : public TWriteOnlyProtocol {
  private:
diff --git a/lib/cpp/src/protocol/TDenseProtocol.h b/lib/cpp/src/protocol/TDenseProtocol.h
index 4692132..014f1f0 100644
--- a/lib/cpp/src/protocol/TDenseProtocol.h
+++ b/lib/cpp/src/protocol/TDenseProtocol.h
@@ -42,7 +42,6 @@
  * We inherit so that we can can explicitly call TBPs's primitive-writing
  * methods within our versions.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TDenseProtocol : public TBinaryProtocol {
  protected:
diff --git a/lib/cpp/src/protocol/TJSONProtocol.h b/lib/cpp/src/protocol/TJSONProtocol.h
index 4287adf..bc9ad4e 100644
--- a/lib/cpp/src/protocol/TJSONProtocol.h
+++ b/lib/cpp/src/protocol/TJSONProtocol.h
@@ -78,7 +78,6 @@
  * client, this would mean that infinities get converted to not-a-number in
  * transmission. I don't know of any work-around for this issue.
  *
- * @author Chad Walters <chad@powerset.com>
  */
 class TJSONProtocol : public TProtocol {
  public:
diff --git a/lib/cpp/src/protocol/TOneWayProtocol.h b/lib/cpp/src/protocol/TOneWayProtocol.h
index ad5f8fa..33c1db4 100644
--- a/lib/cpp/src/protocol/TOneWayProtocol.h
+++ b/lib/cpp/src/protocol/TOneWayProtocol.h
@@ -15,7 +15,6 @@
  * Abstract class for implementing a protocol that can only be written,
  * not read.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TWriteOnlyProtocol : public TProtocol {
  public:
@@ -151,7 +150,6 @@
  * Abstract class for implementing a protocol that can only be read,
  * not written.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TReadOnlyProtocol : public TProtocol {
  public:
diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
index 4507d91..82eb8e9 100644
--- a/lib/cpp/src/protocol/TProtocol.h
+++ b/lib/cpp/src/protocol/TProtocol.h
@@ -100,7 +100,6 @@
  * when parsing an input XML stream, reading should be batched rather than
  * looking ahead character by character for a close tag).
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TProtocol {
  public:
diff --git a/lib/cpp/src/protocol/TProtocolException.h b/lib/cpp/src/protocol/TProtocolException.h
index be0767b..0728ce4 100644
--- a/lib/cpp/src/protocol/TProtocolException.h
+++ b/lib/cpp/src/protocol/TProtocolException.h
@@ -18,7 +18,6 @@
  * base of error handling to be used for various types of protocols, i.e.
  * pipes etc.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TProtocolException : public apache::thrift::TException {
  public:
diff --git a/lib/cpp/src/protocol/TProtocolTap.h b/lib/cpp/src/protocol/TProtocolTap.h
index 07f000d..c7421a3 100644
--- a/lib/cpp/src/protocol/TProtocolTap.h
+++ b/lib/cpp/src/protocol/TProtocolTap.h
@@ -18,7 +18,6 @@
  * through to an enclosed protocol object, but also mirrored as write to a
  * second protocol object.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TProtocolTap : public TReadOnlyProtocol {
  public:
diff --git a/lib/cpp/src/server/TNonblockingServer.h b/lib/cpp/src/server/TNonblockingServer.h
index a47a2c0..960ba65 100644
--- a/lib/cpp/src/server/TNonblockingServer.h
+++ b/lib/cpp/src/server/TNonblockingServer.h
@@ -35,7 +35,6 @@
  * It does not use the TServerTransport framework, but rather has socket
  * operations hardcoded for use with select.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TNonblockingServer : public TServer {
  private:
diff --git a/lib/cpp/src/server/TServer.h b/lib/cpp/src/server/TServer.h
index c30b561..af9da1f 100644
--- a/lib/cpp/src/server/TServer.h
+++ b/lib/cpp/src/server/TServer.h
@@ -65,7 +65,6 @@
 /**
  * Thrift server.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TServer : public concurrency::Runnable {
  public:
diff --git a/lib/cpp/src/server/TSimpleServer.cpp b/lib/cpp/src/server/TSimpleServer.cpp
index 08309b2..d77e423 100644
--- a/lib/cpp/src/server/TSimpleServer.cpp
+++ b/lib/cpp/src/server/TSimpleServer.cpp
@@ -20,7 +20,6 @@
 /**
  * A simple single-threaded application server. Perfect for unit tests!
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 void TSimpleServer::serve() {
 
diff --git a/lib/cpp/src/server/TSimpleServer.h b/lib/cpp/src/server/TSimpleServer.h
index 8bed8c2..be8f4f2 100644
--- a/lib/cpp/src/server/TSimpleServer.h
+++ b/lib/cpp/src/server/TSimpleServer.h
@@ -18,7 +18,6 @@
  * that connection until it closes, and then repeating. It is a good example
  * of how to extend the TServer interface.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TSimpleServer : public TServer {
  public:
diff --git a/lib/cpp/src/transport/TBufferTransports.h b/lib/cpp/src/transport/TBufferTransports.h
index 4e3f187..22be2a7 100644
--- a/lib/cpp/src/transport/TBufferTransports.h
+++ b/lib/cpp/src/transport/TBufferTransports.h
@@ -32,7 +32,6 @@
  * class.  Subclasses are expected to define the "slow path" operations
  * that have to be done when the buffers are full or empty.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TBufferBase : public TTransport {
 
@@ -219,8 +218,6 @@
  * and will serve future data out of a local buffer. For writes, data is
  * stored to an in memory buffer before being written out.
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author David Reiss <dreiss@facebook.com>
  */
 class TBufferedTransport : public TUnderlyingTransport {
  public:
@@ -285,7 +282,6 @@
 /**
  * Wraps a transport into a buffered one.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TBufferedTransportFactory : public TTransportFactory {
  public:
@@ -309,8 +305,6 @@
  * binary chunk followed by the data payload. This allows the receiver on the
  * other end to always do fixed-length reads.
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author David Reiss <dreiss@facebook.com>
  */
 class TFramedTransport : public TUnderlyingTransport {
  public:
@@ -355,7 +349,6 @@
 /**
  * Wraps a transport into a framed one.
  *
- * @author Dave Simpson <dave@powerset.com>
  */
 class TFramedTransportFactory : public TTransportFactory {
  public:
@@ -381,8 +374,6 @@
  * The buffers are allocated using C constructs malloc,realloc, and the size
  * doubles as necessary.  We've considered using scoped
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author David Reiss <dreiss@facebook.com>
  */
 class TMemoryBuffer : public TBufferBase {
  private:
diff --git a/lib/cpp/src/transport/TFDTransport.h b/lib/cpp/src/transport/TFDTransport.h
index 56408ca..0d1251a 100644
--- a/lib/cpp/src/transport/TFDTransport.h
+++ b/lib/cpp/src/transport/TFDTransport.h
@@ -18,7 +18,6 @@
 /**
  * Dead-simple wrapper around a file descriptor.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TFDTransport : public TTransport {
  public:
diff --git a/lib/cpp/src/transport/TFileTransport.cpp b/lib/cpp/src/transport/TFileTransport.cpp
index 3bc2b91..2903450 100644
--- a/lib/cpp/src/transport/TFileTransport.cpp
+++ b/lib/cpp/src/transport/TFileTransport.cpp
@@ -39,7 +39,6 @@
 /**
  * Fake clock_gettime for systems like darwin
  *
- * @author Paul Querna <pquerna@apache.org>
  */
 #define CLOCK_REALTIME 0
 static int clock_gettime(int clk_id /*ignored*/, struct timespec *tp) {
diff --git a/lib/cpp/src/transport/TFileTransport.h b/lib/cpp/src/transport/TFileTransport.h
index 66f17d3..42acb67 100644
--- a/lib/cpp/src/transport/TFileTransport.h
+++ b/lib/cpp/src/transport/TFileTransport.h
@@ -93,7 +93,6 @@
  * Note: The above rules are enforced mainly for debugging its sole client TFileTransport
  *       which uses the buffer in this way.
  *
- * @author James Wang <jwang@facebook.com>
  */
 class TFileTransportBuffer {
   public:
@@ -148,7 +147,6 @@
  * File implementation of a transport. Reads and writes are done to a
  * file on disk.
  *
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 class TFileTransport : public TFileReaderTransport,
                        public TFileWriterTransport {
diff --git a/lib/cpp/src/transport/THttpClient.cpp b/lib/cpp/src/transport/THttpClient.cpp
index fffb4bd..da0f13d 100644
--- a/lib/cpp/src/transport/THttpClient.cpp
+++ b/lib/cpp/src/transport/THttpClient.cpp
@@ -17,7 +17,6 @@
 /**
  * Http client implementation.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 // Yeah, yeah, hacky to put these here, I know.
diff --git a/lib/cpp/src/transport/THttpClient.h b/lib/cpp/src/transport/THttpClient.h
index b0fa28e..ae28eb7 100644
--- a/lib/cpp/src/transport/THttpClient.h
+++ b/lib/cpp/src/transport/THttpClient.h
@@ -18,7 +18,6 @@
  * here is a VERY basic HTTP/1.1 client which supports HTTP 100 Continue,
  * chunked transfer encoding, keepalive, etc. Tested against Apache.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class THttpClient : public TTransport {
  public:
diff --git a/lib/cpp/src/transport/TServerSocket.h b/lib/cpp/src/transport/TServerSocket.h
index b406b78..ec2e460 100644
--- a/lib/cpp/src/transport/TServerSocket.h
+++ b/lib/cpp/src/transport/TServerSocket.h
@@ -18,7 +18,6 @@
  * Server socket implementation of TServerTransport. Wrapper around a unix
  * socket listen and accept calls.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TServerSocket : public TServerTransport {
  public:
diff --git a/lib/cpp/src/transport/TServerTransport.h b/lib/cpp/src/transport/TServerTransport.h
index 612a94c..36382be 100644
--- a/lib/cpp/src/transport/TServerTransport.h
+++ b/lib/cpp/src/transport/TServerTransport.h
@@ -17,7 +17,6 @@
  * Server transport framework. A server needs to have some facility for
  * creating base transports to read/write from.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TServerTransport {
  public:
diff --git a/lib/cpp/src/transport/TShortReadTransport.h b/lib/cpp/src/transport/TShortReadTransport.h
index 8b9b192..f6be77f 100644
--- a/lib/cpp/src/transport/TShortReadTransport.h
+++ b/lib/cpp/src/transport/TShortReadTransport.h
@@ -18,7 +18,6 @@
  * Calls to read are passed through with some probability.  Otherwise,
  * the read amount is randomly reduced before being passed through.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TShortReadTransport : public TTransport {
  public:
diff --git a/lib/cpp/src/transport/TSocket.cpp b/lib/cpp/src/transport/TSocket.cpp
index 1696053..b59bc81 100644
--- a/lib/cpp/src/transport/TSocket.cpp
+++ b/lib/cpp/src/transport/TSocket.cpp
@@ -32,7 +32,6 @@
 /**
  * TSocket implementation.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 TSocket::TSocket(string host, int port) :
diff --git a/lib/cpp/src/transport/TSocket.h b/lib/cpp/src/transport/TSocket.h
index 27baa99..8013582 100644
--- a/lib/cpp/src/transport/TSocket.h
+++ b/lib/cpp/src/transport/TSocket.h
@@ -18,8 +18,6 @@
 /**
  * TCP Socket implementation of the TTransport interface.
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 class TSocket : public TTransport {
   /**
diff --git a/lib/cpp/src/transport/TSocketPool.cpp b/lib/cpp/src/transport/TSocketPool.cpp
index 549569f..85c2a61 100644
--- a/lib/cpp/src/transport/TSocketPool.cpp
+++ b/lib/cpp/src/transport/TSocketPool.cpp
@@ -18,7 +18,6 @@
 /**
  * TSocketPoolServer implementation
  *
- * @author Akhil Wable <akhil@facebook.com>
  */
 TSocketPoolServer::TSocketPoolServer()
   : host_(""),
@@ -40,7 +39,6 @@
 /**
  * TSocketPool implementation.
  *
- * @author Jason Sobel <jsobel@facebook.com>
  */
 
 TSocketPool::TSocketPool() : TSocket(),
diff --git a/lib/cpp/src/transport/TSocketPool.h b/lib/cpp/src/transport/TSocketPool.h
index b72dfb2..becc102 100644
--- a/lib/cpp/src/transport/TSocketPool.h
+++ b/lib/cpp/src/transport/TSocketPool.h
@@ -15,7 +15,6 @@
  /**
   * Class to hold server information for TSocketPool
   *
-  * @author Akhil Wable <akhil@facebook.com>
   */
 class TSocketPoolServer {
 
@@ -49,7 +48,6 @@
 /**
  * TCP Socket implementation of the TTransport interface.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TSocketPool : public TSocket {
 
diff --git a/lib/cpp/src/transport/TTransport.h b/lib/cpp/src/transport/TTransport.h
index e2e30f8..385fe36 100644
--- a/lib/cpp/src/transport/TTransport.h
+++ b/lib/cpp/src/transport/TTransport.h
@@ -18,7 +18,6 @@
  * Generic interface for a method of transporting data. A TTransport may be
  * capable of either reading or writing, but not necessarily both.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TTransport {
  public:
@@ -191,7 +190,6 @@
  * source transport. Commonly used inside servers to make input and output
  * streams out of raw clients.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TTransportFactory {
  public:
diff --git a/lib/cpp/src/transport/TTransportException.h b/lib/cpp/src/transport/TTransportException.h
index d0c44cf..26aec1f 100644
--- a/lib/cpp/src/transport/TTransportException.h
+++ b/lib/cpp/src/transport/TTransportException.h
@@ -19,7 +19,6 @@
  * base of error handling to be used for various types of transports, i.e.
  * pipes etc.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TTransportException : public apache::thrift::TException {
  public:
diff --git a/lib/cpp/src/transport/TTransportUtils.h b/lib/cpp/src/transport/TTransportUtils.h
index 50ce859..7e341df 100644
--- a/lib/cpp/src/transport/TTransportUtils.h
+++ b/lib/cpp/src/transport/TTransportUtils.h
@@ -24,7 +24,6 @@
  * and it will let you write anything you want to it, though it won't actually
  * go anywhere.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TNullTransport : public TTransport {
  public:
@@ -52,7 +51,6 @@
  * The underlying buffer expands to a keep a copy of the entire
  * request/response.
  *
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 class TPipedTransport : virtual public TTransport {
  public:
@@ -178,7 +176,6 @@
 /**
  * Wraps a transport into a pipedTransport instance.
  *
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 class TPipedTransportFactory : public TTransportFactory {
  public:
@@ -212,7 +209,6 @@
  * it is a templatized class, so that clients who rely on a specific
  * TTransport can still access the original transport.
  *
- * @author James Wang <jwang@facebook.com>
  */
 class TPipedFileReaderTransport : public TPipedTransport,
                                   public TFileReaderTransport {
@@ -250,7 +246,6 @@
 /**
  * Creates a TPipedFileReaderTransport from a filepath and a destination transport
  *
- * @author James Wang <jwang@facebook.com>
  */
 class TPipedFileReaderTransportFactory : public TPipedTransportFactory {
  public:
diff --git a/lib/cpp/src/transport/TZlibTransport.h b/lib/cpp/src/transport/TZlibTransport.h
index 482bfda..4cc16b3 100644
--- a/lib/cpp/src/transport/TZlibTransport.h
+++ b/lib/cpp/src/transport/TZlibTransport.h
@@ -55,7 +55,6 @@
  * TODO(dreiss): Don't do an extra copy of the compressed data if
  *               the underlying transport is TBuffered or TMemory.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 class TZlibTransport : public TTransport {
  public:
diff --git a/lib/java/src/org/apache/thrift/TApplicationException.java b/lib/java/src/org/apache/thrift/TApplicationException.java
index 559f8c3..77f03c2 100644
--- a/lib/java/src/org/apache/thrift/TApplicationException.java
+++ b/lib/java/src/org/apache/thrift/TApplicationException.java
@@ -15,7 +15,6 @@
 /**
  * Application level exception
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TApplicationException extends TException {
 
diff --git a/lib/java/src/org/apache/thrift/TBase.java b/lib/java/src/org/apache/thrift/TBase.java
index bf1dc38..5a87183 100644
--- a/lib/java/src/org/apache/thrift/TBase.java
+++ b/lib/java/src/org/apache/thrift/TBase.java
@@ -11,7 +11,6 @@
 /**
  * Generic base interface for generated Thrift objects.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public interface TBase extends Cloneable {
 
diff --git a/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java b/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
index 08eda02..673553f 100644
--- a/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
+++ b/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
@@ -12,7 +12,6 @@
  * Class that allows access to the underlying buf without doing deep
  * copies on it.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TByteArrayOutputStream extends ByteArrayOutputStream {
   public TByteArrayOutputStream(int size) {
diff --git a/lib/java/src/org/apache/thrift/TDeserializer.java b/lib/java/src/org/apache/thrift/TDeserializer.java
index bb6a0e5..266906b 100644
--- a/lib/java/src/org/apache/thrift/TDeserializer.java
+++ b/lib/java/src/org/apache/thrift/TDeserializer.java
@@ -17,7 +17,6 @@
  * Generic utility for easily deserializing objects from a byte array or Java
  * String.
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 public class TDeserializer {
   private final TProtocolFactory protocolFactory_;
diff --git a/lib/java/src/org/apache/thrift/TException.java b/lib/java/src/org/apache/thrift/TException.java
index f62bd5d..12474fc 100644
--- a/lib/java/src/org/apache/thrift/TException.java
+++ b/lib/java/src/org/apache/thrift/TException.java
@@ -9,7 +9,6 @@
 /**
  * Generic exception class for Thrift.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TException extends Exception {
 
diff --git a/lib/java/src/org/apache/thrift/TProcessor.java b/lib/java/src/org/apache/thrift/TProcessor.java
index 030e4a6..9b1e624 100644
--- a/lib/java/src/org/apache/thrift/TProcessor.java
+++ b/lib/java/src/org/apache/thrift/TProcessor.java
@@ -12,7 +12,6 @@
  * A processor is a generic object which operates upon an input stream and
  * writes to some output stream.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public interface TProcessor {
   public boolean process(TProtocol in, TProtocol out)
diff --git a/lib/java/src/org/apache/thrift/TSerializer.java b/lib/java/src/org/apache/thrift/TSerializer.java
index 0653305..2c0f033 100644
--- a/lib/java/src/org/apache/thrift/TSerializer.java
+++ b/lib/java/src/org/apache/thrift/TSerializer.java
@@ -18,7 +18,6 @@
  * Generic utility for easily serializing objects into a byte array or Java
  * String.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TSerializer {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java b/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
index 6b12152..b7f1a6a 100644
--- a/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
+++ b/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
@@ -18,7 +18,6 @@
  * results in bad decoded data -- this is not in compliance with the RFC but is
  * done in the interest of performance.
  *
- * @author Chad Walters <chad@powerset.com>
  */
 class TBase64Utils {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java b/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
index 7e199b4..1a74a2e 100644
--- a/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
@@ -14,7 +14,6 @@
 /**
  * Binary protocol implementation for thrift.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TBinaryProtocol extends TProtocol {
   private static final TStruct ANONYMOUS_STRUCT = new TStruct();
diff --git a/lib/java/src/org/apache/thrift/protocol/TField.java b/lib/java/src/org/apache/thrift/protocol/TField.java
index 78e2328..2ba596c 100644
--- a/lib/java/src/org/apache/thrift/protocol/TField.java
+++ b/lib/java/src/org/apache/thrift/protocol/TField.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates field metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TField {
   public TField() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
index 911bcd4..90393f7 100644
--- a/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
@@ -20,7 +20,6 @@
  * Please see the C++ class header for a detailed description of the
  * protocol's wire format.
  *
- * @author Chad Walters <chad@powerset.com>
  */
 public class TJSONProtocol extends TProtocol {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TList.java b/lib/java/src/org/apache/thrift/protocol/TList.java
index b099df0..7447d8f 100644
--- a/lib/java/src/org/apache/thrift/protocol/TList.java
+++ b/lib/java/src/org/apache/thrift/protocol/TList.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates list metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TList {
   public TList() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TMap.java b/lib/java/src/org/apache/thrift/protocol/TMap.java
index 6d34f87..1229092 100644
--- a/lib/java/src/org/apache/thrift/protocol/TMap.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMap.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates map metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TMap {
   public TMap() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TMessage.java b/lib/java/src/org/apache/thrift/protocol/TMessage.java
index 4fae143..d2fbbe0 100644
--- a/lib/java/src/org/apache/thrift/protocol/TMessage.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMessage.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates struct metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TMessage {
   public TMessage() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TMessageType.java b/lib/java/src/org/apache/thrift/protocol/TMessageType.java
index 62f6e30..6b28455 100644
--- a/lib/java/src/org/apache/thrift/protocol/TMessageType.java
+++ b/lib/java/src/org/apache/thrift/protocol/TMessageType.java
@@ -9,7 +9,6 @@
 /**
  * Message type constants in the Thrift protocol.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TMessageType {
   public static final byte CALL  = 1;
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocol.java b/lib/java/src/org/apache/thrift/protocol/TProtocol.java
index 412aa43..81127ac 100644
--- a/lib/java/src/org/apache/thrift/protocol/TProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocol.java
@@ -12,7 +12,6 @@
 /**
  * Protocol interface definition.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public abstract class TProtocol {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolException.java b/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
index 2228b5c..a72417e 100644
--- a/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolException.java
@@ -11,7 +11,6 @@
 /**
  * Protocol exceptions.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TProtocolException extends TException {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java b/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
index 6a77eba..7159672 100644
--- a/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
@@ -11,8 +11,6 @@
 /**
  * Factory interface for constructing protocol instances.
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 public interface TProtocolFactory {
   public TProtocol getProtocol(TTransport trans);
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java b/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
index fe2ea9f..d07b033 100644
--- a/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
+++ b/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
@@ -12,7 +12,6 @@
  * Utility class with static methods for interacting with protocol data
  * streams.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TProtocolUtil {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TSet.java b/lib/java/src/org/apache/thrift/protocol/TSet.java
index 9ff7477..1a00f7f 100644
--- a/lib/java/src/org/apache/thrift/protocol/TSet.java
+++ b/lib/java/src/org/apache/thrift/protocol/TSet.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates set metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TSet {
   public TSet() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java b/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
index 5846ea2..49ad8e2 100644
--- a/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
+++ b/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
@@ -19,8 +19,6 @@
  * suitable for parsing by scripting languages.  It should not be
  * confused with the full-featured TJSONProtocol.
  *
- * @author Joydeep Sen Sarma <jssarma@facebook.com>
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TSimpleJSONProtocol extends TProtocol {
 
diff --git a/lib/java/src/org/apache/thrift/protocol/TStruct.java b/lib/java/src/org/apache/thrift/protocol/TStruct.java
index 804ffc1..b8e8b6e 100644
--- a/lib/java/src/org/apache/thrift/protocol/TStruct.java
+++ b/lib/java/src/org/apache/thrift/protocol/TStruct.java
@@ -9,7 +9,6 @@
 /**
  * Helper class that encapsulates struct metadata.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TStruct {
   public TStruct() {
diff --git a/lib/java/src/org/apache/thrift/protocol/TType.java b/lib/java/src/org/apache/thrift/protocol/TType.java
index dfa4a5d..46ac727 100644
--- a/lib/java/src/org/apache/thrift/protocol/TType.java
+++ b/lib/java/src/org/apache/thrift/protocol/TType.java
@@ -9,7 +9,6 @@
 /**
  * Type constants in the Thrift protocol.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public final class TType {
   public static final byte STOP   = 0;
diff --git a/lib/java/src/org/apache/thrift/server/TServer.java b/lib/java/src/org/apache/thrift/server/TServer.java
index d4ec10c..de58596 100644
--- a/lib/java/src/org/apache/thrift/server/TServer.java
+++ b/lib/java/src/org/apache/thrift/server/TServer.java
@@ -15,7 +15,6 @@
 /**
  * Generic interface for a Thrift server.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public abstract class TServer {
 
diff --git a/lib/java/src/org/apache/thrift/server/TSimpleServer.java b/lib/java/src/org/apache/thrift/server/TSimpleServer.java
index 3f8da13..bdde32a 100644
--- a/lib/java/src/org/apache/thrift/server/TSimpleServer.java
+++ b/lib/java/src/org/apache/thrift/server/TSimpleServer.java
@@ -22,7 +22,6 @@
 /**
  * Simple singlethreaded server for testing.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TSimpleServer extends TServer {
 
diff --git a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
index 83c95ae..ffda543 100644
--- a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
+++ b/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
@@ -30,7 +30,6 @@
  * Server which uses Java's built in ThreadPool management to spawn off
  * a worker pool that
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TThreadPoolServer extends TServer {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TFramedTransport.java b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
index f7ff5ac..dfd0317 100644
--- a/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TFramedTransport.java
@@ -13,7 +13,6 @@
 /**
  * Socket implementation of the TTransport interface. To be commented soon!
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TFramedTransport extends TTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/THttpClient.java b/lib/java/src/org/apache/thrift/transport/THttpClient.java
index 100cb9c..58513e9 100644
--- a/lib/java/src/org/apache/thrift/transport/THttpClient.java
+++ b/lib/java/src/org/apache/thrift/transport/THttpClient.java
@@ -19,7 +19,6 @@
  * HTTP implementation of the TTransport interface. Used for working with a
  * Thrift web services implementation.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class THttpClient extends TTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java b/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
index 717f48e..26147d8 100644
--- a/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
@@ -18,7 +18,6 @@
  * This allows for compatibility with all the nice constructs Java already
  * has to provide a variety of types of streams.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TIOStreamTransport extends TTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java b/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
index 5555535..cf9faf4 100644
--- a/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
+++ b/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
@@ -12,7 +12,6 @@
 /**
  * Memory buffer-based implementation of the TTransport interface.
  *
- * @author Chad Walters <chad@powerset.com>
  */
 public class TMemoryBuffer extends TTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TServerSocket.java b/lib/java/src/org/apache/thrift/transport/TServerSocket.java
index d5cee7f..f14baa4 100644
--- a/lib/java/src/org/apache/thrift/transport/TServerSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TServerSocket.java
@@ -17,7 +17,6 @@
 /**
  * Wrapper around ServerSocket for Thrift.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TServerSocket extends TServerTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TServerTransport.java b/lib/java/src/org/apache/thrift/transport/TServerTransport.java
index 1730a03..9b56dbc 100644
--- a/lib/java/src/org/apache/thrift/transport/TServerTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TServerTransport.java
@@ -9,7 +9,6 @@
 /**
  * Server transport. Object which provides client transports.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public abstract class TServerTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TSocket.java b/lib/java/src/org/apache/thrift/transport/TSocket.java
index 6a2feb7..9b86cd9 100644
--- a/lib/java/src/org/apache/thrift/transport/TSocket.java
+++ b/lib/java/src/org/apache/thrift/transport/TSocket.java
@@ -18,7 +18,6 @@
 /**
  * Socket implementation of the TTransport interface. To be commented soon!
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TSocket extends TIOStreamTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TTransport.java b/lib/java/src/org/apache/thrift/transport/TTransport.java
index fd7e619..33e255c 100644
--- a/lib/java/src/org/apache/thrift/transport/TTransport.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransport.java
@@ -10,7 +10,6 @@
  * Generic class that encapsulates the I/O layer. This is basically a thin
  * wrapper around the combined functionality of Java input/output streams.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public abstract class TTransport {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TTransportException.java b/lib/java/src/org/apache/thrift/transport/TTransportException.java
index 3bbf38e..aaeea74 100644
--- a/lib/java/src/org/apache/thrift/transport/TTransportException.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransportException.java
@@ -11,7 +11,6 @@
 /**
  * Transport exceptions.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TTransportException extends TException {
 
diff --git a/lib/java/src/org/apache/thrift/transport/TTransportFactory.java b/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
index e0883ed..63af5da 100644
--- a/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
+++ b/lib/java/src/org/apache/thrift/transport/TTransportFactory.java
@@ -12,8 +12,6 @@
  * a ServerTransport and then may want to mutate them (i.e. create
  * a BufferedTransport from the underlying base transport)
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 public class TTransportFactory {
 
diff --git a/lib/java/test/org/apache/thrift/test/EqualityTest.java b/lib/java/test/org/apache/thrift/test/EqualityTest.java
index 5a1eea6..86e00b0 100644
--- a/lib/java/test/org/apache/thrift/test/EqualityTest.java
+++ b/lib/java/test/org/apache/thrift/test/EqualityTest.java
@@ -28,7 +28,6 @@
 import thrift.test.*;
 
 /'''r'''**
- * @author David Reiss <dreiss@facebook.com>
  *'''r'''/
 public class EqualityTest {
   public static void main(String[] args) throws Exception {
@@ -95,7 +94,6 @@
 import thrift.test.*;
 
 /**
- * @author David Reiss <dreiss@facebook.com>
  */
 public class EqualityTest {
   public static void main(String[] args) throws Exception {
diff --git a/lib/java/test/org/apache/thrift/test/IdentityTest.java b/lib/java/test/org/apache/thrift/test/IdentityTest.java
index 584bf14..af0a489 100644
--- a/lib/java/test/org/apache/thrift/test/IdentityTest.java
+++ b/lib/java/test/org/apache/thrift/test/IdentityTest.java
@@ -21,7 +21,6 @@
 
 /**
  *
- * @author David Reiss <dreiss@facebook.com>
  */
 public class IdentityTest {
   public static Object deepCopy(Object oldObj) throws Exception {
diff --git a/lib/java/test/org/apache/thrift/test/JSONProtoTest.java b/lib/java/test/org/apache/thrift/test/JSONProtoTest.java
index c955bc0..ef263f0 100644
--- a/lib/java/test/org/apache/thrift/test/JSONProtoTest.java
+++ b/lib/java/test/org/apache/thrift/test/JSONProtoTest.java
@@ -18,7 +18,6 @@
 /**
  * Tests for the Java implementation of TJSONProtocol. Mirrors the C++ version
  *
- * @author Chad Walters <chad@powerset.com>
  */
 public class JSONProtoTest {
 
diff --git a/lib/java/test/org/apache/thrift/test/TestClient.java b/lib/java/test/org/apache/thrift/test/TestClient.java
index da638d2..d868999 100644
--- a/lib/java/test/org/apache/thrift/test/TestClient.java
+++ b/lib/java/test/org/apache/thrift/test/TestClient.java
@@ -25,7 +25,6 @@
  * this makes a variety of requests to enable testing for both performance and
  * correctness of the output.
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 public class TestClient {
   public static void main(String [] args) {
diff --git a/lib/java/test/org/apache/thrift/test/ToStringTest.java b/lib/java/test/org/apache/thrift/test/ToStringTest.java
index eb99a38..154c7d9 100644
--- a/lib/java/test/org/apache/thrift/test/ToStringTest.java
+++ b/lib/java/test/org/apache/thrift/test/ToStringTest.java
@@ -3,7 +3,6 @@
 import thrift.test.*;
 
 /**
- * @author David Reiss <dreiss@facebook.com>
  */
 public class ToStringTest {
   public static void main(String[] args) throws Exception {
diff --git a/lib/perl/lib/Thrift/FramedTransport.pm b/lib/perl/lib/Thrift/FramedTransport.pm
index 0cf2f3b..ce5dc08 100644
--- a/lib/perl/lib/Thrift/FramedTransport.pm
+++ b/lib/perl/lib/Thrift/FramedTransport.pm
@@ -21,7 +21,6 @@
 # their length.
 #
 # @package thrift.transport
-# @author Mark Slee <mcslee@facebook.com>
 #
 package Thrift::FramedTransport;
 
diff --git a/lib/php/README.apache b/lib/php/README.apache
index 3ddce30..9863aca 100644
--- a/lib/php/README.apache
+++ b/lib/php/README.apache
@@ -21,7 +21,6 @@
 /**
  * Example of how to build a Thrift server in Apache/PHP
  *
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 $GLOBALS['THRIFT_ROOT'] = '/your/thrift/root';
diff --git a/lib/php/src/Thrift.php b/lib/php/src/Thrift.php
index c17c517..5272d06 100644
--- a/lib/php/src/Thrift.php
+++ b/lib/php/src/Thrift.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
diff --git a/lib/php/src/autoload.php b/lib/php/src/autoload.php
index d0b4c63..6c6026f 100644
--- a/lib/php/src/autoload.php
+++ b/lib/php/src/autoload.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
diff --git a/lib/php/src/protocol/TBinaryProtocol.php b/lib/php/src/protocol/TBinaryProtocol.php
index 4877112..833f213 100644
--- a/lib/php/src/protocol/TBinaryProtocol.php
+++ b/lib/php/src/protocol/TBinaryProtocol.php
@@ -9,14 +9,11 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.protocol
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
  * Binary implementation of the Thrift protocol.
  *
- * @author Mark Slee <mcslee@facebook.com>
- * @author Marc Kwiatkowski <marc@facebook.com>
  */
 class TBinaryProtocol extends TProtocol {
 
diff --git a/lib/php/src/protocol/TProtocol.php b/lib/php/src/protocol/TProtocol.php
index 7e736d5..3b2f589 100644
--- a/lib/php/src/protocol/TProtocol.php
+++ b/lib/php/src/protocol/TProtocol.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.protocol
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -16,8 +15,6 @@
  * a protocol encoder/decoder.
  *
  * @package thrift.protocol
- * @author Mark Slee <mcslee@facebook.com>
- * @author Aditya Agarwal <aditya@facebook.com>
  */
 
 /**
diff --git a/lib/php/src/transport/TBufferedTransport.php b/lib/php/src/transport/TBufferedTransport.php
index 2682569..87abfb2 100644
--- a/lib/php/src/transport/TBufferedTransport.php
+++ b/lib/php/src/transport/TBufferedTransport.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -17,7 +16,6 @@
  * read and then serve data out of the internal buffer.
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TBufferedTransport extends TTransport {
 
diff --git a/lib/php/src/transport/TFramedTransport.php b/lib/php/src/transport/TFramedTransport.php
index 2c7a344..c3a61f6 100644
--- a/lib/php/src/transport/TFramedTransport.php
+++ b/lib/php/src/transport/TFramedTransport.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -16,7 +15,6 @@
  * their length.
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TFramedTransport extends TTransport {
 
diff --git a/lib/php/src/transport/THttpClient.php b/lib/php/src/transport/THttpClient.php
index 9ac1370..47b38eb 100644
--- a/lib/php/src/transport/THttpClient.php
+++ b/lib/php/src/transport/THttpClient.php
@@ -8,14 +8,12 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
  * HTTP client for Thrift
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class THttpClient extends TTransport {
 
diff --git a/lib/php/src/transport/TMemoryBuffer.php b/lib/php/src/transport/TMemoryBuffer.php
index c34fb67..1defbae 100644
--- a/lib/php/src/transport/TMemoryBuffer.php
+++ b/lib/php/src/transport/TMemoryBuffer.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Levy Klots <lklots@facebook.com>
  */
 
 /**
@@ -18,7 +17,6 @@
  * buffer.
  *
  * @package thrift.transport
- * @author Levy Klots <lklots@facebook.com>
  */
 class TMemoryBuffer extends TTransport {
 
diff --git a/lib/php/src/transport/TNullTransport.php b/lib/php/src/transport/TNullTransport.php
index b24cee5..450fc74 100644
--- a/lib/php/src/transport/TNullTransport.php
+++ b/lib/php/src/transport/TNullTransport.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -16,7 +15,6 @@
  * This is useful for measuring the serialized size of structures.
  *
  * @package thrift.transport
- * @author David Reiss <dreiss@facebook.com>
  */
 class TNullTransport extends TTransport {
 
diff --git a/lib/php/src/transport/TPhpStream.php b/lib/php/src/transport/TPhpStream.php
index d1350d7..9a3049a 100644
--- a/lib/php/src/transport/TPhpStream.php
+++ b/lib/php/src/transport/TPhpStream.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -16,7 +15,6 @@
  * php://input and php://output
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TPhpStream extends TTransport {
 
diff --git a/lib/php/src/transport/TSocket.php b/lib/php/src/transport/TSocket.php
index 3967748..7c47958 100644
--- a/lib/php/src/transport/TSocket.php
+++ b/lib/php/src/transport/TSocket.php
@@ -8,14 +8,12 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
  * Sockets implementation of the TTransport interface.
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TSocket extends TTransport {
 
diff --git a/lib/php/src/transport/TSocketPool.php b/lib/php/src/transport/TSocketPool.php
index bd28db6..8d75ce3 100644
--- a/lib/php/src/transport/TSocketPool.php
+++ b/lib/php/src/transport/TSocketPool.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /** Inherits from Socket */
@@ -30,7 +29,6 @@
  * to a pool of servers.
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 class TSocketPool extends TSocket {
 
diff --git a/lib/php/src/transport/TTransport.php b/lib/php/src/transport/TTransport.php
index 6740dcd..10ee647 100644
--- a/lib/php/src/transport/TTransport.php
+++ b/lib/php/src/transport/TTransport.php
@@ -8,7 +8,6 @@
  * http://developers.facebook.com/thrift/
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 
 /**
@@ -31,7 +30,6 @@
  * Base interface for a transport agent.
  *
  * @package thrift.transport
- * @author Mark Slee <mcslee@facebook.com>
  */
 abstract class TTransport {