cleanup of parts and pieces; they need to be separate.

I can't build the xelatex format on my machine. Someone else can uncomment that stuff from the headers and rebuild them and add the .pdfs to the repo.