XBinder cleanup