Remove stray comments left over from merge.