Removed redundant operations

Modulus is unnecessary since the mask helpers do it for you now.