Remove UDH references