cleanup, xdm back