Remove UXPDS support