More cleaning up for operators.