Remove x2p remnants