Get rid of X11 where it's possible