diff --git a/src/assembler_x86_test.cc b/src/assembler_x86_test.cc
index ffe3d0b..ead5bcb 100644
--- a/src/assembler_x86_test.cc
+++ b/src/assembler_x86_test.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "assembler_x86.h"
 
diff --git a/src/calling_convention.cc b/src/calling_convention.cc
index e21b317..ab6bba9 100644
--- a/src/calling_convention.cc
+++ b/src/calling_convention.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
 
 #include "calling_convention.h"
 #include "logging.h"
diff --git a/src/calling_convention.h b/src/calling_convention.h
index b335597..adcafca 100644
--- a/src/calling_convention.h
+++ b/src/calling_convention.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
 
 #ifndef ART_SRC_CALLING_CONVENTION_H_
 #define ART_SRC_CALLING_CONVENTION_H_
diff --git a/src/calling_convention_arm.cc b/src/calling_convention_arm.cc
index a7a080e..bdf2e45 100644
--- a/src/calling_convention_arm.cc
+++ b/src/calling_convention_arm.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
 
 #include "calling_convention.h"
 #include "logging.h"
diff --git a/src/calling_convention_x86.cc b/src/calling_convention_x86.cc
index d245d818..2d9b07f 100644
--- a/src/calling_convention_x86.cc
+++ b/src/calling_convention_x86.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
 
 #include "calling_convention.h"
 #include "logging.h"
diff --git a/src/class_linker.cc b/src/class_linker.cc
index 4524457..64b31a2 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "class_linker.h"
 
diff --git a/src/heap.cc b/src/heap.cc
index 0746361..b9998da 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "heap.h"
 
diff --git a/src/heap.h b/src/heap.h
index 6ce2db7..c71080e 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_HEAP_H_
 #define ART_SRC_HEAP_H_
diff --git a/src/jni_compiler.h b/src/jni_compiler.h
index 48666aa..c0b14cb 100644
--- a/src/jni_compiler.h
+++ b/src/jni_compiler.h
@@ -1,5 +1,5 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
+
 #ifndef ART_SRC_JNI_COMPILER_H_
 #define ART_SRC_JNI_COMPILER_H_
 
diff --git a/src/jni_compiler_test.cc b/src/jni_compiler_test.cc
index cfedb85..6211d8f 100644
--- a/src/jni_compiler_test.cc
+++ b/src/jni_compiler_test.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: irogers@google.com (Ian Rogers)
 
 #include <sys/mman.h>
 
diff --git a/src/jni_internal_arm.cc b/src/jni_internal_arm.cc
index b1ba248..b2777d6 100644
--- a/src/jni_internal_arm.cc
+++ b/src/jni_internal_arm.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "jni_internal.h"
 
diff --git a/src/jni_internal_x86.cc b/src/jni_internal_x86.cc
index 17c7b24..82fbb57 100644
--- a/src/jni_internal_x86.cc
+++ b/src/jni_internal_x86.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "jni_internal.h"
 
diff --git a/src/log_severity.h b/src/log_severity.h
index d9ac925..26a5a19 100644
--- a/src/log_severity.h
+++ b/src/log_severity.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #ifndef BASE_LOG_SEVERITY_H_
 #define BASE_LOG_SEVERITY_H_
diff --git a/src/logging_android.cc b/src/logging_android.cc
index 56e2dae..8acb6ef 100644
--- a/src/logging_android.cc
+++ b/src/logging_android.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #include "logging.h"
 
diff --git a/src/logging_linux.cc b/src/logging_linux.cc
index 4be989d..aa7dc91 100644
--- a/src/logging_linux.cc
+++ b/src/logging_linux.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #include "logging.h"
 
diff --git a/src/mark_stack.cc b/src/mark_stack.cc
index 5dc4f77..47aaf0c 100644
--- a/src/mark_stack.cc
+++ b/src/mark_stack.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "mark_stack.h"
 
diff --git a/src/mark_stack.h b/src/mark_stack.h
index 6b71c84..eeeb79c 100644
--- a/src/mark_stack.h
+++ b/src/mark_stack.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_MARK_STACK_H_
 #define ART_SRC_MARK_STACK_H_
diff --git a/src/mark_sweep.cc b/src/mark_sweep.cc
index ffc3977..523b9e4 100644
--- a/src/mark_sweep.cc
+++ b/src/mark_sweep.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "mark_sweep.h"
 
diff --git a/src/mark_sweep.h b/src/mark_sweep.h
index 570d90d..47a703a 100644
--- a/src/mark_sweep.h
+++ b/src/mark_sweep.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_MARK_SWEEP_H_
 #define ART_SRC_MARK_SWEEP_H_
diff --git a/src/monitor.h b/src/monitor.h
index 2f5b5ff..9ab3dd9 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_MONITOR_H_
 #define ART_SRC_MONITOR_H_
diff --git a/src/object_test.cc b/src/object_test.cc
index 7167732..52fb288 100644
--- a/src/object_test.cc
+++ b/src/object_test.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "class_linker.h"
 #include "common_test.h"
diff --git a/src/offsets.cc b/src/offsets.cc
index 6fdc4d1..500e17e 100644
--- a/src/offsets.cc
+++ b/src/offsets.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "offsets.h"
 
diff --git a/src/offsets.h b/src/offsets.h
index 2fe873c..19c672a 100644
--- a/src/offsets.h
+++ b/src/offsets.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_OFFSETS_H_
 #define ART_SRC_OFFSETS_H_
diff --git a/src/runtime_android.cc b/src/runtime_android.cc
index 958d6e5..4561552 100644
--- a/src/runtime_android.cc
+++ b/src/runtime_android.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #include "runtime.h"
 
diff --git a/src/runtime_linux.cc b/src/runtime_linux.cc
index 4aa90f0..e4bc035 100644
--- a/src/runtime_linux.cc
+++ b/src/runtime_linux.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #include "runtime.h"
 
diff --git a/src/space.cc b/src/space.cc
index 10d5f93..9f01838 100644
--- a/src/space.cc
+++ b/src/space.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "space.h"
 
diff --git a/src/space.h b/src/space.h
index 663efa5..3cfa505 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_SPACE_H_
 #define ART_SRC_SPACE_H_
diff --git a/src/space_test.cc b/src/space_test.cc
index 9a61fa5..f3c713b 100644
--- a/src/space_test.cc
+++ b/src/space_test.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #include "space.h"
 
diff --git a/src/stringprintf.cc b/src/stringprintf.cc
index 4f59fc1..8643c57 100644
--- a/src/stringprintf.cc
+++ b/src/stringprintf.cc
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #include "stringprintf.h"
 
diff --git a/src/stringprintf.h b/src/stringprintf.h
index b1b1d8d..2e685d1 100644
--- a/src/stringprintf.h
+++ b/src/stringprintf.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: enh@google.com (Elliott Hughes)
 
 #ifndef STRINGPRINTF_H_
 #define STRINGPRINTF_H_
diff --git a/src/thread.h b/src/thread.h
index 23272f1..e065f68 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,5 +1,4 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
-// Author: cshapiro@google.com (Carl Shapiro)
 
 #ifndef ART_SRC_THREAD_H_
 #define ART_SRC_THREAD_H_