Remove address masking