clean up X11 conditionals