Remove address masking after some rearranging