More header comment updates, and rem'd some dead code.