Removing stuff not required for XQDT