chore: clean-up operator code
8 files changed