===> Cleaning for xdm-1.1.17