Operator cleanup

| Q                   | A
| ------------------- | ---
| Bug fix?            | N
| New feature?        | N
| BC breaks?          | N
| Tests pass?         | Y
| Scenarios pass?     | ?
| Checkstyle issues?  | N
| Changelog updated?  | N
| Fixed tickets       | N
| Doc PR              |