Initial removal of X11 cruft.