Remove some unneeded code in MathOperator