diff --git a/accounts/account_manager.go b/accounts/account_manager.go
index 27014f9a6..8262faf21 100644
--- a/accounts/account_manager.go
+++ b/accounts/account_manager.go
@@ -14,12 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Gustav Simonsson <gustav.simonsson@gmail.com>
- * @date 2015
- *
- */
 /*
 
 This abstracts part of a user's interaction with an account she controls.
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index 6619a4a76..b2acd84c7 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -14,12 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors:
- * 	Jeffrey Wilcke <i@jev.io>
- * 	Taylor Gerring <taylor.gerring@gmail.com>
- */
-
 package main
 
 import (
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 27a130805..9c1bd4b72 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -14,11 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Jeffrey Wilcke <i@jev.io>
- */
-
 package main
 
 import (
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index b266f6774..251121030 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -14,10 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Jeffrey Wilcke <i@jev.io>
- */
 package main
 
 import (
diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go
index 1e844bc59..2f74c073d 100644
--- a/cmd/rlpdump/main.go
+++ b/cmd/rlpdump/main.go
@@ -14,11 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Felix Lange <felix@ethdev.com>
- */
-
 // rlpdump is a pretty-printer for RLP data.
 package main
 
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index f60630c37..9d95732c0 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -14,11 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Jeffrey Wilcke <i@jev.io>
- * 	Viktor Tron <viktor@ethdev.com>
- */
 package utils
 
 import (
diff --git a/crypto/key.go b/crypto/key.go
index d9e0334ae..bf09bf232 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -14,13 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Gustav Simonsson <gustav.simonsson@gmail.com>
- * @date 2015
- *
- */
-
 package crypto
 
 import (
diff --git a/crypto/key_store_passphrase.go b/crypto/key_store_passphrase.go
index d5955e337..86b0b33c2 100644
--- a/crypto/key_store_passphrase.go
+++ b/crypto/key_store_passphrase.go
@@ -14,13 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Gustav Simonsson <gustav.simonsson@gmail.com>
- * @date 2015
- *
- */
-
 /*
 
 This key store behaves as KeyStorePlain with the difference that
diff --git a/crypto/key_store_plain.go b/crypto/key_store_plain.go
index db521ba95..428d01e25 100644
--- a/crypto/key_store_plain.go
+++ b/crypto/key_store_plain.go
@@ -14,13 +14,6 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with go-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * @authors
- * 	Gustav Simonsson <gustav.simonsson@gmail.com>
- * @date 2015
- *
- */
-
 package crypto
 
 import (