Removed unmasking code from two variables that don't need it