Remove xcb and stick to Xlib