Convert dtor to XCB, better queueing of requests, more cleanups