When you are refactoring the code, why don't you get rid of `Ops` calls?