Remove modulus operations