More removed duplicates, some silly comment text removed.

I've taken the liberty of removing a few more duplicates, and fixing some historical silliness with some of these files.