diff --git a/var/spack/repos/builtin/packages/blitz/package.py b/var/spack/repos/builtin/packages/blitz/package.py
index 82ff634925..9413b276fe 100644
--- a/var/spack/repos/builtin/packages/blitz/package.py
+++ b/var/spack/repos/builtin/packages/blitz/package.py
@@ -1,40 +1,15 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install blitz
-#
-# You can always get back here to change things with:
-#
-#     spack edit blitz
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Blitz(Package):
     """N-dimensional arrays for C++"""
     homepage = "http://github.com/blitzpp/blitz"
-
-# This version doesn't have the configure script generated yet.
     url      = "https://github.com/blitzpp/blitz/tarball/1.0.0"
-#http://prdownloads.sourceforge.net/%(namelower)s
 
     version('1.0.0', '9f040b9827fe22228a892603671a77af')
 
-    # FIXME: Add dependencies if this package requires them.
-    # depends_on("foo")
+    # No dependencies
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
-        # FIXME: Spack couldn't guess one, so here are some options:
         configure('--prefix=%s' % prefix)
-        # cmake('.', *std_cmake_args)
-
-        # FIXME: Add logic to build and install here
         make()
         make("install")
diff --git a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py
index 9d70eab05f..8d51a10679 100644
--- a/var/spack/repos/builtin/packages/netcdf-cxx4/package.py
+++ b/var/spack/repos/builtin/packages/netcdf-cxx4/package.py
@@ -1,19 +1,3 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install netcdf-cxx4
-#
-# You can always get back here to change things with:
-#
-#     spack edit netcdf-cxx4
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class NetcdfCxx4(Package):
@@ -25,17 +9,14 @@ class NetcdfCxx4(Package):
 
 
     variant('mpi', default=True, description='Enables MPI parallelism')
-#    variant('hdf4',    default=False, description="Enable HDF4 support")
 
-    # NetCDF-CXX4 doesn't really depend (directly) on MPI.  However... this
+    # netcdf-cxx4 doesn't really depend (directly) on MPI.  However... this
     # depndency ensures taht the right version of MPI is selected (eg: ^openmpi)
     depends_on('mpi', when='+mpi')
     depends_on('netcdf')
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         configure('--prefix=%s' % prefix)
 
-        # FIXME: Add logic to build and install here
         make()
         make("install")
diff --git a/var/spack/repos/builtin/packages/netcdf-fortran/package.py b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
index 8e5c8ecc3a..9e4aee95fb 100644
--- a/var/spack/repos/builtin/packages/netcdf-fortran/package.py
+++ b/var/spack/repos/builtin/packages/netcdf-fortran/package.py
@@ -10,7 +10,7 @@ class NetcdfFortran(Package):
 
     variant('mpi', default=True, description='Enables MPI parallelism')
 
-    # NetCDF-CXX4 doesn't really depend (directly) on MPI.  However... this
+    # netcdf-fortran doesn't really depend (directly) on MPI.  However... this
     # depndency ensures taht the right version of MPI is selected (eg: ^openmpi)
     depends_on('mpi', when='+mpi')
     depends_on('netcdf')
diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py
index 4a0d3feac7..797772f4f6 100644
--- a/var/spack/repos/builtin/packages/proj/package.py
+++ b/var/spack/repos/builtin/packages/proj/package.py
@@ -1,19 +1,3 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install proj
-#
-# You can always get back here to change things with:
-#
-#     spack edit proj
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Proj(Package):
@@ -27,8 +11,7 @@ class Proj(Package):
     version('4.7.0', '927d34623b52e0209ba2bfcca18fe8cd')
     version('4.6.1', '7dbaab8431ad50c25669fd3fb28dc493')
 
-    # FIXME: Add dependencies if this package requires them.
-    # depends_on("foo")
+    # No dependencies
 
     def install(self, spec, prefix):
         configure('--prefix=%s' % prefix)