xopxe remove unused and masking variables