Clean up some more of the junk after validating that my documentation was correct.