Cleaned out the cruft

I left in only one bit & explained why in a comment.  I also added a slight comment sweetening.