Removing "UDOP" references