diff --git a/opal/mca/maffinity/first_use/maffinity_first_use.h b/opal/mca/maffinity/first_use/maffinity_first_use.h
index f24b51b704..bb7c662dd7 100644
--- a/opal/mca/maffinity/first_use/maffinity_first_use.h
+++ b/opal/mca/maffinity/first_use/maffinity_first_use.h
@@ -18,48 +18,6 @@
  * @file
  *
  * Processor affinity for First_Use.
- *
- * First_Use sucks.  There are at least 3 different ways that
- * sched_setaffinity is implemented (only one of which -- the most
- * outdated -- is documented in the sched_setaffinity(2) man page):
- *
- *-----------------------------------------------------------------
- * 1. int sched_setaffinity(pid_t pid, unsigned int len, unsigned
- * long *mask);
- *
- * This originated in 2.5 kernels (which we won't worry about) and
- * some distros back-ported it to their 2.4 kernels.  It's unknown if
- * this appears in any 2.6 kernels.
- *
- * 2. int sched_setaffinity (pid_t __pid, size_t __cpusetsize,
- * const cpu_set_t *__cpuset);
- *
- * This appears to be in recent 2.6 kernels (confirmed in Gentoo
- * 2.6.11).  I don't know when #1 changed into #2.  However, this
- * prototype is nice -- the cpu_set_t type is accompanied by
- * fdset-like CPU_ZERO(), CPU_SET(), CPU_ISSET(), etc. macros.
- *
- * 3. int sched_setaffinity (pid_t __pid, const cpu_set_t *__mask);
- *
- * (note the missing len parameter) This is in at least some First_Use
- * distros (e.g., MDK 10.0 with a 2.6.3 kernel, and SGI Altix, even
- * though the Altix uses a 2.4-based kernel and therefore likely
- * back-ported the 2.5 work but modified it for their needs).  Similar
- * to #2, the cpu_set_t type is accompanied by fdset-like CPU_ZERO(),
- * CPU_SET(), CPU_ISSET(), etc. macros.
- *-----------------------------------------------------------------
- *
- * This component has to figure out which one to use.  :-\
- *
- * Also note that at least some distros of First_Use have a broken
- * CPU_ZERO macro (a pair of typos in /usr/include/bits/sched.h).
- * MDK 9.2 is the screaming example, but it's pretty old and
- * probably only matters because one of the developers uses that as
- * a compilation machine :-) (it also appears to have been fixed in
- * MDK 10.0, but they also changed from #2 to #3 -- arrgh!).
- * However, there's no way of knowing where these typos came from
- * and if they exist elsewhere.  So it seems safest to extend this
- * configure script to check for a bad CPU_ZERO macro.  #$%#@%$@!!!
  */
 
 
@@ -72,18 +30,6 @@
 #include "opal/mca/maffinity/maffinity.h"
 
 
-/**
- * Determine whether we have a working CPU_ZERO() macro or not.  If
- * not, use memset().
- */
-#ifdef HAVE_CPU_ZERO
-#define OMPI_CPU_ZERO(foo) CPU_ZERO(foo)
-#else
-#include <string.h>
-#define OMPI_CPU_ZERO(foo) memset(foo, 0, sizeof(*foo))
-#endif
-
-
 #if defined(c_plusplus) || defined(__cplusplus)
 extern "C" {
 #endif
diff --git a/opal/mca/maffinity/first_use/maffinity_first_use_component.c b/opal/mca/maffinity/first_use/maffinity_first_use_component.c
index 816a43ce97..6b0a0ed022 100644
--- a/opal/mca/maffinity/first_use/maffinity_first_use_component.c
+++ b/opal/mca/maffinity/first_use/maffinity_first_use_component.c
@@ -12,12 +12,6 @@
  * Additional copyrights may follow
  * 
  * $HEADER$
- *
- * These symbols are in a file by themselves to provide nice linker
- * semantics.  Since linkers generally pull in symbols by object
- * files, keeping these symbols as the only symbols in this file
- * prevents utility programs such as "ompi_info" from having to import
- * entire components just to query their version and parameters.
  */
 
 #include "ompi_config.h"