diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 0ef6b731edcccbd875a8c2e20bc7009a6cc13686..218f25b586ea1a590a6a1469a376598f2b94782b 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -1,27 +1,3 @@
-##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-#
-# This file is part of Spack.
-# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
-# LLNL-CODE-647188
-#
-# For details, see https://github.com/llnl/spack
-# Please also see the LICENSE file for our notice and the LGPL.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License (as published by
-# the Free Software Foundation) version 2.1 dated February 1999.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##############################################################################
 from spack import *
 
 from contextlib import closing
diff --git a/var/spack/repos/builtin/packages/go/package.py b/var/spack/repos/builtin/packages/go/package.py
index 6fe212c80074f83c83f1c1dd594c2693bb4f8db7..80924c7fad5e7ecbf147efbf7de8ab3270301ce1 100644
--- a/var/spack/repos/builtin/packages/go/package.py
+++ b/var/spack/repos/builtin/packages/go/package.py
@@ -59,19 +59,10 @@ def setup_dependent_package(self, module, ext_spec):
     def setup_dependent_environment(self, spack_env, run_env, ext_spec):
         """Called before go modules' install() methods.
 
-        In most cases, extensions will only need to have one line::
+        In most cases, extensions will only need to have two lines::
 
         go('get', '<package>')
+        shutil.copytree('bin', os.path.join(prefix, '/bin'))
         """
-        # spack_env.set("GOROOT", self.spec.prefix)
-        # run_env.set("GOROOT", self.spec.prefix)
-
-        # stage_path = os.path.realpath(ext_spec.package.stage.source_path)
-        # print "PREFIX: {}".format(stage_path)
-        # go_paths = [stage_path]
-        # for d in ext_spec.traverse():
-        #     if d.package.extends(self.spec):
-        #         go_paths.append(d.prefix)
-        # spack_env.prepend_path('GOPATH',  ':'.join(go_paths))
 
         spack_env.set('GOPATH', ext_spec.package.stage.source_path)