diff --git a/LICENSE.txt b/LICENSE.txt
index 14e2f777f..fa274d92d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,3 +1,5 @@
+Copyright 2016 ISRG.  All rights reserved.
+
 Mozilla Public License Version 2.0
 ==================================
 
diff --git a/bdns/dns.go b/bdns/dns.go
index 1774cf764..97d096f7a 100644
--- a/bdns/dns.go
+++ b/bdns/dns.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package bdns
 
 import (
diff --git a/bdns/dns_test.go b/bdns/dns_test.go
index 1907f9e48..67acec6e4 100644
--- a/bdns/dns_test.go
+++ b/bdns/dns_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package bdns
 
 import (
diff --git a/bdns/problem.go b/bdns/problem.go
index 26dcc1894..019475a98 100644
--- a/bdns/problem.go
+++ b/bdns/problem.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package bdns
 
 import (
diff --git a/bdns/problem_test.go b/bdns/problem_test.go
index 59aafd792..086ecd870 100644
--- a/bdns/problem_test.go
+++ b/bdns/problem_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package bdns
 
 import (
diff --git a/ca/certificate-authority.go b/ca/certificate-authority.go
index 7718e9268..192731187 100644
--- a/ca/certificate-authority.go
+++ b/ca/certificate-authority.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ca
 
 import (
diff --git a/ca/certificate-authority_test.go b/ca/certificate-authority_test.go
index 170633e4a..9b981d6e6 100644
--- a/ca/certificate-authority_test.go
+++ b/ca/certificate-authority_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ca
 
 import (
diff --git a/cmd/admin-revoker/main.go b/cmd/admin-revoker/main.go
index 6aac7753c..67363bf26 100644
--- a/cmd/admin-revoker/main.go
+++ b/cmd/admin-revoker/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go
index 1ab0ad309..52b1d20a6 100644
--- a/cmd/boulder-ca/main.go
+++ b/cmd/boulder-ca/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-publisher/main.go b/cmd/boulder-publisher/main.go
index eb518b372..c241ce8bb 100644
--- a/cmd/boulder-publisher/main.go
+++ b/cmd/boulder-publisher/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-ra/main.go b/cmd/boulder-ra/main.go
index d92662f2b..79ee493ef 100644
--- a/cmd/boulder-ra/main.go
+++ b/cmd/boulder-ra/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go
index 41ffd7755..bbd59d8f6 100644
--- a/cmd/boulder-sa/main.go
+++ b/cmd/boulder-sa/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-va/gsb.go b/cmd/boulder-va/gsb.go
index 8a95cb31a..6dc30417c 100644
--- a/cmd/boulder-va/gsb.go
+++ b/cmd/boulder-va/gsb.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-va/main.go b/cmd/boulder-va/main.go
index 57c17fe41..b238e1d55 100644
--- a/cmd/boulder-va/main.go
+++ b/cmd/boulder-va/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/boulder-wfe/main.go b/cmd/boulder-wfe/main.go
index 8b86f98f6..fd11191f7 100644
--- a/cmd/boulder-wfe/main.go
+++ b/cmd/boulder-wfe/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/cert-checker/main.go b/cmd/cert-checker/main.go
index 8e1b0d676..12f6280be 100644
--- a/cmd/cert-checker/main.go
+++ b/cmd/cert-checker/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/cert-checker/main_test.go b/cmd/cert-checker/main_test.go
index fd174e53a..202dbcf05 100644
--- a/cmd/cert-checker/main_test.go
+++ b/cmd/cert-checker/main_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/config.go b/cmd/config.go
index f20bae0fc..13b8f5760 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package cmd
 
 import (
diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
index 7e2bd324f..d83aea3fe 100644
--- a/cmd/expiration-mailer/main.go
+++ b/cmd/expiration-mailer/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/expiration-mailer/main_test.go b/cmd/expiration-mailer/main_test.go
index be14c93d2..db2c67d7f 100644
--- a/cmd/expiration-mailer/main_test.go
+++ b/cmd/expiration-mailer/main_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/ocsp-responder/main.go b/cmd/ocsp-responder/main.go
index d69f0f5bf..e345fade6 100644
--- a/cmd/ocsp-responder/main.go
+++ b/cmd/ocsp-responder/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/ocsp-updater/main.go b/cmd/ocsp-updater/main.go
index eb95e980a..f4653cdfa 100644
--- a/cmd/ocsp-updater/main.go
+++ b/cmd/ocsp-updater/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/cmd/rabbitmq-setup/main.go b/cmd/rabbitmq-setup/main.go
index 1fadfb48c..79bd52599 100644
--- a/cmd/rabbitmq-setup/main.go
+++ b/cmd/rabbitmq-setup/main.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 // This command does a one-time setup of the RabbitMQ exchange suitable
diff --git a/cmd/shell.go b/cmd/shell.go
index 0a4e30121..a61c230ce 100644
--- a/cmd/shell.go
+++ b/cmd/shell.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 // This package provides utilities that underlie the specific commands.
 // The idea is to make the specific command files very small, e.g.:
 //
diff --git a/cmd/single-ocsp/main.go b/cmd/single-ocsp/main.go
index 7e1ff5834..e0e3369e1 100644
--- a/cmd/single-ocsp/main.go
+++ b/cmd/single-ocsp/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/core/challenges.go b/core/challenges.go
index 28a6030a2..2810aa6b8 100644
--- a/core/challenges.go
+++ b/core/challenges.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/core_test.go b/core/core_test.go
index bd25e94cd..31e679789 100644
--- a/core/core_test.go
+++ b/core/core_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/good_key.go b/core/good_key.go
index d6a96d54f..7b3b42aee 100644
--- a/core/good_key.go
+++ b/core/good_key.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/good_key_test.go b/core/good_key_test.go
index 47dd495b7..85bd0a442 100644
--- a/core/good_key_test.go
+++ b/core/good_key_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/interfaces.go b/core/interfaces.go
index 48c7dffab..d63221225 100644
--- a/core/interfaces.go
+++ b/core/interfaces.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/nonce.go b/core/nonce.go
index 0be0ca0c8..f61c2ccd5 100644
--- a/core/nonce.go
+++ b/core/nonce.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/nonce_test.go b/core/nonce_test.go
index cbecbe4e5..c11ca6356 100644
--- a/core/nonce_test.go
+++ b/core/nonce_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/objects.go b/core/objects.go
index d43ecb8cb..e732475bf 100644
--- a/core/objects.go
+++ b/core/objects.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/objects_test.go b/core/objects_test.go
index 58df6cbcd..1fa76533e 100644
--- a/core/objects_test.go
+++ b/core/objects_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/util.go b/core/util.go
index bc81b47f0..5f5eb9810 100644
--- a/core/util.go
+++ b/core/util.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/util_test.go b/core/util_test.go
index 3757f21ce..eb2002890 100644
--- a/core/util_test.go
+++ b/core/util_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import (
diff --git a/core/va.go b/core/va.go
index 6a4fc5828..671f5f48b 100644
--- a/core/va.go
+++ b/core/va.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package core
 
 import "golang.org/x/net/context"
diff --git a/log/log.go b/log/log.go
index a25cfd39c..c21a9ba98 100644
--- a/log/log.go
+++ b/log/log.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package log
 
 import (
diff --git a/log/log_test.go b/log/log_test.go
index eb53703e2..d5aa70004 100644
--- a/log/log_test.go
+++ b/log/log_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package log
 
 import (
diff --git a/log/mock.go b/log/mock.go
index 720c892b4..b63ff7f76 100644
--- a/log/mock.go
+++ b/log/mock.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package log
 
 import (
diff --git a/mail/mailer.go b/mail/mailer.go
index 6174cb7e9..f2a74ca47 100644
--- a/mail/mailer.go
+++ b/mail/mailer.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package mail
 
 import (
diff --git a/mail/mailer_test.go b/mail/mailer_test.go
index d51399e8a..b9f845290 100644
--- a/mail/mailer_test.go
+++ b/mail/mailer_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package mail
 
 import (
diff --git a/metrics/metrics.go b/metrics/metrics.go
index de7d7a5df..0becbd181 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package metrics
 
 import (
diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
index 262f036eb..1abe097a3 100644
--- a/metrics/metrics_test.go
+++ b/metrics/metrics_test.go
@@ -1,6 +1 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package metrics
diff --git a/metrics/scope.go b/metrics/scope.go
index 58b67678a..e849cb4b3 100644
--- a/metrics/scope.go
+++ b/metrics/scope.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 //go:generate mockgen -package metrics -destination ./mock_statsd_test.go github.com/cactus/go-statsd-client/statsd Statter
 
 package metrics
diff --git a/metrics/scope_test.go b/metrics/scope_test.go
index 29c3f4579..9167dbd87 100644
--- a/metrics/scope_test.go
+++ b/metrics/scope_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package metrics
 
 import (
diff --git a/mocks/mocks.go b/mocks/mocks.go
index 12904e912..92d650d57 100644
--- a/mocks/mocks.go
+++ b/mocks/mocks.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package mocks
 
 import (
diff --git a/policy/policy-authority.go b/policy/policy-authority.go
index 7d4634860..45a4458e8 100644
--- a/policy/policy-authority.go
+++ b/policy/policy-authority.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package policy
 
 import (
diff --git a/policy/policy-authority_test.go b/policy/policy-authority_test.go
index 7576e9e1d..bcfcdf2aa 100644
--- a/policy/policy-authority_test.go
+++ b/policy/policy-authority_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package policy
 
 import (
diff --git a/publisher/publisher.go b/publisher/publisher.go
index 4a97b1ffc..4b6c691cb 100644
--- a/publisher/publisher.go
+++ b/publisher/publisher.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package publisher
 
 import (
diff --git a/publisher/publisher_test.go b/publisher/publisher_test.go
index 4796c1e53..3910015b2 100644
--- a/publisher/publisher_test.go
+++ b/publisher/publisher_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package publisher
 
 import (
diff --git a/ra/registration-authority.go b/ra/registration-authority.go
index 9f99abe40..d699cbe7f 100644
--- a/ra/registration-authority.go
+++ b/ra/registration-authority.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ra
 
 import (
diff --git a/ra/registration-authority_test.go b/ra/registration-authority_test.go
index 5e76664ca..63927c9d1 100644
--- a/ra/registration-authority_test.go
+++ b/ra/registration-authority_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ra
 
 import (
diff --git a/ra/safe.go b/ra/safe.go
index 076a471b9..08577ec95 100644
--- a/ra/safe.go
+++ b/ra/safe.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ra
 
 import (
diff --git a/ra/safe_test.go b/ra/safe_test.go
index 124dc6052..f081e85b9 100644
--- a/ra/safe_test.go
+++ b/ra/safe_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package ra
 
 import (
diff --git a/rpc/amqp-rpc.go b/rpc/amqp-rpc.go
index 51034d0d7..7263afe10 100644
--- a/rpc/amqp-rpc.go
+++ b/rpc/amqp-rpc.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package rpc
 
 import (
diff --git a/rpc/amqp-rpc_test.go b/rpc/amqp-rpc_test.go
index 59622ed91..d1452eb4e 100644
--- a/rpc/amqp-rpc_test.go
+++ b/rpc/amqp-rpc_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package rpc
 
 import (
diff --git a/rpc/rpc-interfaces.go b/rpc/rpc-interfaces.go
index 9003c7e59..f3f9a424f 100644
--- a/rpc/rpc-interfaces.go
+++ b/rpc/rpc-interfaces.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package rpc
 
 // Client describes the functions an RPC Client performs
diff --git a/rpc/rpc-wrappers.go b/rpc/rpc-wrappers.go
index b5d021ace..29c91c753 100644
--- a/rpc/rpc-wrappers.go
+++ b/rpc/rpc-wrappers.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package rpc
 
 import (
diff --git a/rpc/rpc-wrappers_test.go b/rpc/rpc-wrappers_test.go
index 339998fe9..4c8948e4f 100644
--- a/rpc/rpc-wrappers_test.go
+++ b/rpc/rpc-wrappers_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package rpc
 
 import (
diff --git a/sa/database.go b/sa/database.go
index 5603ce9da..f78cda032 100644
--- a/sa/database.go
+++ b/sa/database.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/database_test.go b/sa/database_test.go
index 36a08a695..209727a27 100644
--- a/sa/database_test.go
+++ b/sa/database_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/ip_range_test.go b/sa/ip_range_test.go
index 603780119..a92fc7b92 100644
--- a/sa/ip_range_test.go
+++ b/sa/ip_range_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/model.go b/sa/model.go
index 0967cd0e5..c2bc0aa71 100644
--- a/sa/model.go
+++ b/sa/model.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/storage-authority.go b/sa/storage-authority.go
index 090f3b761..963f83ce9 100644
--- a/sa/storage-authority.go
+++ b/sa/storage-authority.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/storage-authority_test.go b/sa/storage-authority_test.go
index 76660fcf1..36a89513a 100644
--- a/sa/storage-authority_test.go
+++ b/sa/storage-authority_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/type-converter.go b/sa/type-converter.go
index 5adcd8e12..a7afcaf41 100644
--- a/sa/type-converter.go
+++ b/sa/type-converter.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/sa/type-converter_test.go b/sa/type-converter_test.go
index 5661d74b4..887a1e0e2 100644
--- a/sa/type-converter_test.go
+++ b/sa/type-converter_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package sa
 
 import (
diff --git a/test/ct-test-srv/main.go b/test/ct-test-srv/main.go
index 1dbd8fc65..039bf4e95 100644
--- a/test/ct-test-srv/main.go
+++ b/test/ct-test-srv/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 // This is a test server that implements the subset of RFC6962 APIs needed to
 // run Boulder's CT log submission code. Currently it only implements add-chain.
 // This is used by startservers.py.
diff --git a/test/dns-test-srv/main.go b/test/dns-test-srv/main.go
index 7b6a6521d..7f11303df 100644
--- a/test/dns-test-srv/main.go
+++ b/test/dns-test-srv/main.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package main
 
 import (
diff --git a/test/js/acme-util.js b/test/js/acme-util.js
index d76369893..151e37c76 100644
--- a/test/js/acme-util.js
+++ b/test/js/acme-util.js
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 module.exports = {
 
   fromStandardB64: function(x) {
diff --git a/test/js/crypto-util.js b/test/js/crypto-util.js
index a0f0bf7e2..852a0c3d3 100644
--- a/test/js/crypto-util.js
+++ b/test/js/crypto-util.js
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 var crypto = require("crypto");
 var forge = require("node-forge");
 var util = require("./acme-util.js");
diff --git a/test/js/revoke.js b/test/js/revoke.js
index 5918a52e3..a2de62579 100644
--- a/test/js/revoke.js
+++ b/test/js/revoke.js
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-//
 // To revoke a certificate against a local Boulder:
 // js revoke.js cert.pem key.pem
 
diff --git a/test/js/test.js b/test/js/test.js
index a124e95d2..7c253f08d 100644
--- a/test/js/test.js
+++ b/test/js/test.js
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-//
 // To test against a Boulder running on localhost in test mode:
 // cd boulder/test/js
 // npm install
diff --git a/test/test-tools.go b/test/test-tools.go
index fc3aeb109..0ba9b28b8 100644
--- a/test/test-tools.go
+++ b/test/test-tools.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package test
 
 import (
diff --git a/va/gsb.go b/va/gsb.go
index 6309227b4..3e47daf6d 100644
--- a/va/gsb.go
+++ b/va/gsb.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 // go:generate mockgen -source ./gsb.go -destination mock_gsb_test.go -package va
 
 package va
diff --git a/va/gsb_test.go b/va/gsb_test.go
index 84e7d8c24..6f43ceabd 100644
--- a/va/gsb_test.go
+++ b/va/gsb_test.go
@@ -1,8 +1,3 @@
-// Copyright 2015 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package va
 
 import (
diff --git a/va/validation-authority.go b/va/validation-authority.go
index eef8c35ca..b1e5364da 100644
--- a/va/validation-authority.go
+++ b/va/validation-authority.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package va
 
 import (
diff --git a/va/validation-authority_test.go b/va/validation-authority_test.go
index 620bc3680..65560c239 100644
--- a/va/validation-authority_test.go
+++ b/va/validation-authority_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package va
 
 import (
diff --git a/wfe/web-front-end.go b/wfe/web-front-end.go
index 5f8e318f7..7e639e1ab 100644
--- a/wfe/web-front-end.go
+++ b/wfe/web-front-end.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package wfe
 
 import (
diff --git a/wfe/web-front-end_test.go b/wfe/web-front-end_test.go
index 776112cd1..94fab6253 100644
--- a/wfe/web-front-end_test.go
+++ b/wfe/web-front-end_test.go
@@ -1,8 +1,3 @@
-// Copyright 2014 ISRG.  All rights reserved
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
 package wfe
 
 import (