Removing stale usepackage
Setting options for tikx
Replacing tikz diagrams with xypic

Someone, probably @mikeshulman should double-check my changes.
I have kids screaming off the top of their lungs and chasing
each other while I am doing this. Now I will go and put them
to bed. Hopefully.