diff --git a/doc/html/team.html b/doc/html/team.html
index d98c3eb2e3b6eb581449f1e600e5ecb13e105ceb..47a1bc4799d62f8550bc4b0bc90cd42f736c33da 100644
--- a/doc/html/team.html
+++ b/doc/html/team.html
@@ -71,7 +71,7 @@ The current SLURM development staff includes: </p>
 </ul>
 <p> SLURM alumni and contributers include: 
 <ul>
-Ernest Artiaga (barcelona Supercomputer Center></li>
+<li>Ernest Artiaga (barcelona Supercomputer Center></li>
 <li>Daniel Christians (HP)</li>
 <li>Chris Dunlap (LLNL)</li>
 <li>Joey Ekstrom (LLNL/Bringham Young University)</li>
diff --git a/src/srun/msg.c b/src/srun/msg.c
index 795fa4fb3b50b9314e50d58d21369aa1f8e94ed6..9e623146dc23c734183b3d2de1ab37eee023881f 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -117,9 +117,6 @@ _build_proctable(srun_job_t *job, char *host, int nodeid, int ntasks, uint32_t *
 	
 	if (MPIR_proctable_size == 0) {
 		MPIR_proctable_size = opt.nprocs;
-/* 		MPIR_proctable = xmalloc(sizeof(MPIR_PROCDESC) * opt.nprocs); */
-/* 		totalview_jobid = NULL; */
-/* 		xstrfmtcat(totalview_jobid, "%lu", job->jobid);		 */
 		
 		if(message_thread) {
 			write(job->forked_msg->par_msg->msg_pipe[1],
@@ -137,10 +134,6 @@ _build_proctable(srun_job_t *job, char *host, int nodeid, int ntasks, uint32_t *
 
 	for (i = 0; i < ntasks; i++) {
 		int taskid          = job->step_layout->tids[nodeid][i];
-		/* MPIR_PROCDESC *tv   = &MPIR_proctable[taskid]; */
-/* 		tv->host_name       = job->host[nodeid]; */
-/* 		tv->executable_name = remote_argv[0]; */
-/* 		tv->pid             = pid[i]; */
 		
 		if(message_thread) {
 			pipe_enum = PIPE_MPIR_PROCDESC;
@@ -158,11 +151,6 @@ _build_proctable(srun_job_t *job, char *host, int nodeid, int ntasks, uint32_t *
 	}
 
 	if (tasks_recorded == opt.nprocs) {
-		/* MPIR_debug_state = MPIR_DEBUG_SPAWNED; */
-/* 		MPIR_Breakpoint(); */
-/* 		if (opt.debugger_test) */
-/* 			_dump_proctable(job);  */
-		
 		if(message_thread) {
 			i = MPIR_DEBUG_SPAWNED;
 			pipe_enum = PIPE_MPIR_DEBUG_STATE;
@@ -197,8 +185,6 @@ void debugger_launch_failure(srun_job_t *job)
 	pipe_enum_t pipe_enum = PIPE_MPIR_DEBUG_STATE;
 	
 	if (opt.parallel_debug) {
-		/* MPIR_debug_state = MPIR_DEBUG_ABORTING; */
-/* 		MPIR_Breakpoint();  */
 		if(message_thread && job) {
 			i = MPIR_DEBUG_ABORTING;
 			write(job->forked_msg->par_msg->msg_pipe[1],